[jboss-cvs] JBossAS SVN: r73520 - in projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security: auth/login and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 20 08:27:24 EDT 2008
Author: anil.saldhana at jboss.com
Date: 2008-05-20 08:27:24 -0400 (Tue, 20 May 2008)
New Revision: 73520
Modified:
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/AbstractServerAuthModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SimpleClientAuthModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SimpleServerAuthModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfoContainer.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/ConfigUtil.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/JASPIAuthenticationInfo.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/LoginModuleStackContainer.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/LoginModuleStackHolder.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/AuthProviderRegistrationDelegate.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossAuthConfigFactory.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossAuthConfigProvider.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossClientAuthConfig.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossClientAuthContext.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossServerAuthConfig.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossServerAuthContext.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/BaseCertLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/CertRolesLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DatabaseCertLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DatabaseServerLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DecodeAction.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/IdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/LdapLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/MemoryUsersRolesLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/ProxyLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/RoleMappingLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/RunAsLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/Users.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsersLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsersRolesLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/XMLLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/AuthorizationInfoContainer.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationConfigEntryHolder.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/cache/JBossAuthenticationCache.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/modules/AbstractIdentityTrustModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/RoleMappingConfigContainer.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/MappingProviderUtil.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/principal/SubjectCNMapper.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/principal/SubjectDNMapper.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossSecurityContextUtil.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/audit/SecurityActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/SubjectActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/mapping/JBossMappingManager.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/mapping/SecurityActions.java
Log:
generics fix
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/AbstractServerAuthModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/AbstractServerAuthModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/AbstractServerAuthModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -47,6 +47,7 @@
* @since Jan 9, 2006
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public abstract class AbstractServerAuthModule implements ServerAuthModule
{
/**
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -27,15 +27,14 @@
import javax.security.auth.message.AuthException;
import javax.security.auth.message.AuthStatus;
import javax.security.auth.message.MessageInfo;
-
-//$Id$
-
+
/**
* Server Auth Module that delegates work to a login context
* @author Anil.Saldhana at redhat.com
* @since Jul 25, 2007
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class DelegatingServerAuthModule extends AbstractServerAuthModule
{
private LoginContext loginContext = null;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SecurityActions.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SecurityActions.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -31,7 +31,6 @@
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-//$Id$
/**
* Privileged Blocks
@@ -43,9 +42,9 @@
{
static ClassLoader getContextClassLoader()
{
- return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
{
- public Object run()
+ public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
}
@@ -55,13 +54,12 @@
static LoginContext createLoginContext(final String configName,
final Subject subject, final CallbackHandler cbh) throws PrivilegedActionException
{
- return (LoginContext) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<LoginContext>()
{
- public Object run() throws LoginException
+ public LoginContext run() throws LoginException
{
return new LoginContext(configName, subject, cbh);
}
});
- }
-
-}
+ }
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SimpleClientAuthModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SimpleClientAuthModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SimpleClientAuthModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -41,15 +41,20 @@
* @author <mailto:Anil.Saldhana at jboss.org>Anil Saldhana
* @since Dec 5, 2005
*/
+ at SuppressWarnings("unchecked")
public class SimpleClientAuthModule implements ClientAuthModule
{
private Class[] supportedTypes = null;
private SimplePrincipal principal = null;
private Object credential = null;
+ @SuppressWarnings("unused")
private MessagePolicy requestPolicy = null;
+ @SuppressWarnings("unused")
private MessagePolicy responsePolicy = null;
+ @SuppressWarnings("unused")
private CallbackHandler handler = null;
+ @SuppressWarnings("unused")
private Map options = null;
public SimpleClientAuthModule(Class[] supportedTypes)
@@ -113,4 +118,4 @@
subject.getPrincipals().remove(principal);
subject.getPublicCredentials().remove(credential);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SimpleServerAuthModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SimpleServerAuthModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/container/modules/SimpleServerAuthModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -41,15 +41,14 @@
* @since Dec 6, 2005
*/
public class SimpleServerAuthModule extends AbstractServerAuthModule
-{
-
+{
public SimpleServerAuthModule()
{
supportedTypes.add(Object.class);
supportedTypes.add(Object.class);
}
- public SimpleServerAuthModule(Class[] supTypes)
+ public SimpleServerAuthModule(Class<?>[] supTypes)
{
super();
this.supportedTypes.addAll(Arrays.asList(supTypes));
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfoContainer.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfoContainer.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/AuthenticationInfoContainer.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -49,12 +49,15 @@
String authName = null;
+ @SuppressWarnings("unchecked")
List moduleEntries = new ArrayList();
+ @SuppressWarnings("unchecked")
Map loginModuleStackMap = new HashMap();
boolean isJASPIAuthentication = false;
+ @SuppressWarnings("unchecked")
public void addChild(QName name, Object value)
{
log.debug("addChild::" + name + ":" + value);
@@ -89,6 +92,7 @@
}
}
+ @SuppressWarnings("unchecked")
public Object instantiate()
{
if(isJASPIAuthentication == false)
@@ -104,9 +108,9 @@
return info;
}
- public Class getTargetClass()
+ public Class<?> getTargetClass()
{
return BaseAuthenticationInfo.class;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/ConfigUtil.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/ConfigUtil.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/ConfigUtil.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -42,6 +42,7 @@
@param policy , the application-policy/authentication element
@return the AuthenticationInfo object for the xml policy fragment
*/
+ @SuppressWarnings("unchecked")
static public AuthenticationInfo parseAuthentication(Element policy)
throws Exception
{
@@ -67,6 +68,7 @@
return info;
}
+ @SuppressWarnings("unchecked")
static void parseModule(Element module, ArrayList entries)
throws Exception
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/JASPIAuthenticationInfo.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/JASPIAuthenticationInfo.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/JASPIAuthenticationInfo.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -37,6 +37,7 @@
* @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
* @since Dec 21, 2005
*/
+ at SuppressWarnings("unchecked")
public class JASPIAuthenticationInfo extends BaseAuthenticationInfo
{
Map loginModuleStack = Collections.synchronizedMap(new HashMap());
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/LoginModuleStackContainer.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/LoginModuleStackContainer.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/LoginModuleStackContainer.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -36,6 +36,7 @@
* @since Dec 24, 2005
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class LoginModuleStackContainer implements GenericValueContainer
{
String lmsName = null;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/LoginModuleStackHolder.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/LoginModuleStackHolder.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/login/LoginModuleStackHolder.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -34,6 +34,7 @@
* @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
* @since Dec 21, 2005
*/
+ at SuppressWarnings("unchecked")
public class LoginModuleStackHolder
{
public static final AuthPermission GET_CONFIG_ENTRY_PERM = new AuthPermission("getLoginConfiguration");
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/AuthProviderRegistrationDelegate.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/AuthProviderRegistrationDelegate.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/AuthProviderRegistrationDelegate.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -55,27 +55,28 @@
/**
* Map of String key to provider
*/
- private Map keyProviderMap = new HashMap();
+ private Map<String,AuthConfigProvider> keyProviderMap = new HashMap<String,AuthConfigProvider>();
/**
* Map of key to listener
*/
- private Map keyListenerMap = new HashMap();
+ private Map<String,RegistrationListener> keyListenerMap = new HashMap<String,RegistrationListener>();
/**
* Map of registration id to description
*/
- private Map idToDescriptionMap = new HashMap();
+ private Map<String,String> idToDescriptionMap = new HashMap<String,String>();
/**
* Map of registration id to key
*/
- private Map idKeyMap = new HashMap();
+ private Map<String,String> idKeyMap = new HashMap<String,String>();
/**
* Map of provider to a list of registration ids
*/
- private Map providerToIDListMap = new HashMap();
+ private Map<AuthConfigProvider,List<String>> providerToIDListMap =
+ new HashMap<AuthConfigProvider,List<String>>();
public AuthProviderRegistrationDelegate()
@@ -85,6 +86,7 @@
/**
* @see AuthConfigFactory#detachListener(RegistrationListener, String, String)
*/
+ @SuppressWarnings("unchecked")
public String[] detachListener(RegistrationListener listener, String layer,
String appContext)
{
@@ -125,6 +127,7 @@
/**
* @see AuthConfigFactory#getConfigProvider(String, String, RegistrationListener)
*/
+ @SuppressWarnings("unchecked")
public AuthConfigProvider getConfigProvider(String layer, String appContext,
RegistrationListener listener)
{
@@ -193,6 +196,7 @@
/**
* @see AuthConfigFactory#getRegistrationIDs(AuthConfigProvider)
*/
+ @SuppressWarnings("unchecked")
public String[] getRegistrationIDs(AuthConfigProvider provider)
{
List al = new ArrayList();
@@ -214,6 +218,7 @@
/**
* @see AuthConfigFactory#registerConfigProvider(String, Map, String, String, String)
*/
+ @SuppressWarnings("unchecked")
public String registerConfigProvider(String className, Map properties,
String layer, String appContext, String description)
throws AuthException, SecurityException
@@ -238,6 +243,7 @@
return this.registerConfigProvider(acp, layer, appContext, description);
}
+ @SuppressWarnings("unchecked")
public String registerConfigProvider(AuthConfigProvider provider,
String layer, String appContext, String description)
{
@@ -296,4 +302,4 @@
}
return false;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossAuthConfigFactory.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossAuthConfigFactory.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossAuthConfigFactory.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -44,7 +44,7 @@
public JBossAuthConfigFactory()
{
delegate = new AuthProviderRegistrationDelegate();
- Map props = new HashMap();
+ Map<String,Object> props = new HashMap<String,Object>();
JBossAuthConfigProvider provider = new JBossAuthConfigProvider(props);
//register a few default providers for the layers
delegate.registerConfigProvider(provider, "HTTP", " ", "Default Provider");
@@ -95,6 +95,7 @@
/**
* @see AuthConfigFactory#registerConfigProvider(String, Map, String, String, String)
*/
+ @SuppressWarnings("unchecked")
public String registerConfigProvider(String className, Map properties,
String layer, String appContext, String description)
throws AuthException, SecurityException
@@ -117,4 +118,4 @@
{
return delegate.registerConfigProvider(provider, layer, appContext, description);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossAuthConfigProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossAuthConfigProvider.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossAuthConfigProvider.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -42,7 +42,7 @@
public class JBossAuthConfigProvider implements AuthConfigProvider
{
private static Logger log = Logger.getLogger(JBossAuthConfigProvider.class);
- private Map contextProperties = null;
+ private Map<String,Object> contextProperties = null;
private String cbhProperty = "authconfigprovider.client.callbackhandler";
/**
@@ -50,7 +50,7 @@
*
* @param props Context Properties
*/
- public JBossAuthConfigProvider(Map props)
+ public JBossAuthConfigProvider(Map<String,Object> props)
{
this.contextProperties = props;
}
@@ -115,7 +115,7 @@
throw new IllegalStateException("CallbackHandler not defined by system property "+
cbhProperty);
ClassLoader cl = SecurityActions.getContextClassLoader();
- Class cls = cl.loadClass(cbhClass);
+ Class<?> cls = cl.loadClass(cbhClass);
return (CallbackHandler)cls.newInstance();
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossClientAuthConfig.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossClientAuthConfig.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossClientAuthConfig.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -45,8 +45,11 @@
{
private String layer = null;
private String contextId = null;
+ @SuppressWarnings("unused")
private CallbackHandler callbackHandler = null;
+ @SuppressWarnings("unchecked")
private List modules = new ArrayList();
+ @SuppressWarnings({"unchecked", "unused"})
private Map contextProperties;
/**
@@ -57,6 +60,7 @@
* @param handler Callback Handler to be passed to auth modules
* @param properties Contextual properties
*/
+ @SuppressWarnings("unchecked")
public JBossClientAuthConfig(String layer, String appContext,
CallbackHandler handler, Map properties)
{
@@ -69,6 +73,7 @@
/**
* @see ClientAuthConfig#getAuthContext(String, Map)
*/
+ @SuppressWarnings("unchecked")
public ClientAuthContext getAuthContext(String authContextID,
Subject clientSubject, Map properties)
throws AuthException
@@ -100,6 +105,7 @@
}
//Custom Methods
+ @SuppressWarnings("unchecked")
public List getClientAuthModules()
{
return modules ;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossClientAuthContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossClientAuthContext.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossClientAuthContext.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -59,10 +59,10 @@
/**
* @see ClientAuth#cleanSubject(Subject, Map)
*/
+ @SuppressWarnings("unchecked")
public void cleanSubject(MessageInfo messageInfo, Subject subject)
throws AuthException
- {
- AuthStatus status = null;
+ {
Iterator iter = config.getClientAuthModules().iterator();
while(iter.hasNext())
{
@@ -73,6 +73,7 @@
/**
* @see ClientAuth#secureRequest(AuthParam, Subject, Map)
*/
+ @SuppressWarnings("unchecked")
public AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject) throws AuthException
{
Iterator iter = config.getClientAuthModules().iterator();
@@ -89,6 +90,7 @@
/**
* @see ClientAuth#validateResponse(AuthParam, Subject, Subject, Map)
*/
+ @SuppressWarnings("unchecked")
public AuthStatus validateResponse(MessageInfo messageInfo, Subject clientSubject,
Subject serviceSubject) throws AuthException
{
@@ -103,4 +105,4 @@
}
return status;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossServerAuthConfig.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossServerAuthConfig.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossServerAuthConfig.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -60,7 +60,9 @@
private String layer;
private String contextId;
private CallbackHandler callbackHandler;
+ @SuppressWarnings("unchecked")
private List modules = new ArrayList();
+ @SuppressWarnings({"unused", "unchecked"})
private Map contextProperties;
/**
@@ -71,6 +73,7 @@
* @param handler Callback Handler that will be passed to the modules
* @param properties Context Properties
*/
+ @SuppressWarnings("unchecked")
public JBossServerAuthConfig(String layer, String appContext,
CallbackHandler handler, Map properties)
{
@@ -83,6 +86,7 @@
/**
* @see ServerAuthConfig#getAuthContext(String, Map)
*/
+ @SuppressWarnings("unchecked")
public ServerAuthContext getAuthContext(String authContextID,
Subject serviceSubject, Map properties)
throws AuthException
@@ -179,6 +183,7 @@
}
//Custom Methods
+ @SuppressWarnings("unchecked")
public List getServerAuthModules()
{
return this.modules ;
@@ -194,6 +199,7 @@
throw new RuntimeException("Not Implemented");
}
+ @SuppressWarnings("unchecked")
private ServerAuthModule createSAM(String name )
throws Exception
{
@@ -202,6 +208,7 @@
return (ServerAuthModule) ctr.newInstance(new Object[0]);
}
+ @SuppressWarnings("unchecked")
private ServerAuthModule createSAM(String name, String lmshName )
throws Exception
{
@@ -209,4 +216,4 @@
Constructor ctr = clazz.getConstructor(new Class[]{String.class});
return (ServerAuthModule) ctr.newInstance(new Object[]{lmshName});
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossServerAuthContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossServerAuthContext.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/message/config/JBossServerAuthContext.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -48,8 +48,10 @@
{
private List<ServerAuthModule> modules = new ArrayList<ServerAuthModule>();
+ @SuppressWarnings("unchecked")
private Map<String,Map> moduleOptionsByName = new HashMap<String,Map>();
+ @SuppressWarnings("unchecked")
public JBossServerAuthContext(List<ServerAuthModule> modules,
Map<String,Map> moduleNameToOptions, CallbackHandler cbh) throws AuthException
{
@@ -90,6 +92,7 @@
/**
* @see ServerAuth#validateRequest(AuthParam, Subject, Subject, Map)
*/
+ @SuppressWarnings("unchecked")
public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject,
Subject serviceSubject) throws AuthException
{
@@ -127,4 +130,4 @@
}
return status;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -74,7 +74,9 @@
{
protected Subject subject;
protected CallbackHandler callbackHandler;
+ @SuppressWarnings("unchecked")
protected Map sharedState;
+ @SuppressWarnings("unchecked")
protected Map options;
protected Logger log;
/** Flag indicating if the shared credential should be used */
@@ -111,7 +113,7 @@
* @param options the parameters passed to the login module.
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
this.subject = subject;
this.callbackHandler = callbackHandler;
@@ -202,7 +204,7 @@
if( loginOk == false )
return false;
- Set principals = subject.getPrincipals();
+ Set<Principal> principals = subject.getPrincipals();
Principal identity = getIdentity();
principals.add(identity);
Group[] roleSets = getRoleSets();
@@ -221,7 +223,7 @@
subjectGroup = tmp;
}
// Copy the group members to the Subject group
- Enumeration members = group.members();
+ Enumeration<? extends Principal> members = group.members();
while( members.hasMoreElements() )
{
Principal role = (Principal) members.nextElement();
@@ -248,7 +250,7 @@
log.trace("logout");
// Remove the user identity
Principal identity = getIdentity();
- Set principals = subject.getPrincipals();
+ Set<Principal> principals = subject.getPrincipals();
principals.remove(identity);
// Remove any added Groups...
return true;
@@ -283,10 +285,10 @@
method to locate the 'Roles' group or create additional types of groups.
@return A named Group from the principals set.
*/
- protected Group createGroup(String name, Set principals)
+ protected Group createGroup(String name, Set<Principal> principals)
{
Group roles = null;
- Iterator iter = principals.iterator();
+ Iterator<Principal> iter = principals.iterator();
while( iter.hasNext() )
{
Object next = iter.next();
@@ -317,6 +319,7 @@
* @return the principal instance
* @throws java.lang.Exception thrown if the custom principal type cannot be created.
*/
+ @SuppressWarnings("unchecked")
protected Principal createIdentity(String username)
throws Exception
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/BaseCertLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/BaseCertLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/BaseCertLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -91,7 +91,7 @@
* @param options the parameters passed to the login module.
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
super.initialize(subject, callbackHandler, sharedState, options);
trace = log.isTraceEnabled();
@@ -134,7 +134,7 @@
try
{
ClassLoader loader = SecurityActions.getContextClassLoader();
- Class verifierClass = loader.loadClass(option);
+ Class<?> verifierClass = loader.loadClass(option);
verifier = (X509CertificateVerifier) verifierClass.newInstance();
}
catch(Throwable e)
@@ -153,6 +153,7 @@
/**
* Perform the authentication of the username and password.
*/
+ @SuppressWarnings("unchecked")
public boolean login() throws LoginException
{
if( trace )
@@ -390,8 +391,8 @@
}
else
{
- ArrayList aliases = new ArrayList();
- Enumeration en = keyStore.aliases();
+ ArrayList<String> aliases = new ArrayList<String>();
+ Enumeration<String> en = keyStore.aliases();
while (en.hasMoreElements())
{
aliases.add(en.nextElement());
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/CertRolesLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/CertRolesLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/CertRolesLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -75,7 +75,7 @@
defaultRoles.properties.
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
super.initialize(subject, callbackHandler, sharedState, options);
trace = log.isTraceEnabled();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DatabaseCertLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DatabaseCertLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DatabaseCertLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -57,7 +57,7 @@
* "select Role, RoleGroup from Roles where PrincipalID=?"
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
super.initialize(subject, callbackHandler, sharedState, options);
dsJndiName = (String) options.get("dsJndiName");
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DatabaseServerLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DatabaseServerLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DatabaseServerLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -41,7 +41,6 @@
import org.jboss.security.plugins.TransactionManagerLocator;
-//import org.jboss.tm.TransactionDemarcationSupport;
/**
* A JDBC based login module that supports authentication and role mapping.
@@ -96,7 +95,7 @@
* "select Role, RoleGroup from Roles where PrincipalID=?"
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
super.initialize(subject, callbackHandler, sharedState, options);
dsJndiName = (String) options.get("dsJndiName");
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DecodeAction.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DecodeAction.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/DecodeAction.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -36,7 +36,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-class DecodeAction implements PrivilegedExceptionAction
+class DecodeAction implements PrivilegedExceptionAction<Object>
{
/** The permission required to access decode, decode64 */
private static final RuntimePermission decodePermission =
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/IdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/IdentityLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/IdentityLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -57,7 +57,8 @@
{
}
- public void initialize(Subject subject, CallbackHandler handler, Map sharedState, Map options)
+ public void initialize(Subject subject, CallbackHandler handler,
+ Map<String,?> sharedState, Map<String,?> options)
{
super.initialize(subject, handler, sharedState, options);
principalName = (String) options.get("principal");
@@ -66,6 +67,7 @@
roleNames = (String) options.get("roles");
}
+ @SuppressWarnings("unchecked")
public boolean login() throws LoginException
{
if( super.login() == true )
@@ -100,4 +102,4 @@
}
return roleSets;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/LdapExtLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -360,6 +360,7 @@
@return the userDN string for the successful authentication
@throws NamingException
*/
+ @SuppressWarnings("unchecked")
protected String bindDNAuthentication(InitialLdapContext ctx,
String user, Object credential, String baseDN, String filter)
throws NamingException
@@ -371,7 +372,6 @@
NamingEnumeration results = null;
-
Object[] filterArgs = {user};
results = ctx.search(baseDN, filter, filterArgs, constraints);
if (results.hasMore() == false)
@@ -406,6 +406,7 @@
@param nesting
@throws NamingException
*/
+ @SuppressWarnings("unchecked")
protected void rolesSearch(InitialLdapContext ctx, SearchControls constraints,
String user, String userDN, int recursionMax, int nesting)
throws NamingException
@@ -490,6 +491,7 @@
}
+ @SuppressWarnings("unchecked")
private InitialLdapContext constructInitialLdapContext(String dn, Object credential) throws NamingException
{
Properties env = new Properties();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/LdapLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/LdapLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/LdapLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -248,6 +248,7 @@
return isValid;
}
+ @SuppressWarnings("unchecked")
private void createLdapInitContext(String username, Object credential)
throws Exception
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/MemoryUsersRolesLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/MemoryUsersRolesLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/MemoryUsersRolesLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -52,7 +52,7 @@
* @param options
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
// First extract the users/roles Properties from the options
this.users = (Properties) options.get("users");
@@ -65,7 +65,7 @@
* Provide the users map obtained during initialize
* @return the users login module option value
*/
- protected Properties createUsers(Map options)
+ protected Properties createUsers(Map<String,?> options)
{
return users;
}
@@ -74,8 +74,8 @@
* Provide the users map obtained during initialize
* @return the users login module option value
*/
- protected Properties createRoles(Map options) throws IOException
+ protected Properties createRoles(Map<String,?> options) throws IOException
{
return roles;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/ProxyLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/ProxyLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/ProxyLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -59,7 +59,8 @@
moduleName: the classname of the module that this proxy module
delegates all calls to.
*/
- public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options)
+ public void initialize(Subject subject, CallbackHandler callbackHandler,
+ Map<String,?> sharedState, Map<String,?> options)
{
moduleName = (String) options.get("moduleName");
if( moduleName == null )
@@ -72,7 +73,7 @@
ClassLoader loader = SecurityActions.getContextClassLoader();
try
{
- Class clazz = loader.loadClass(moduleName);
+ Class<?> clazz = loader.loadClass(moduleName);
delegate = (LoginModule) clazz.newInstance();
}
catch(Throwable t)
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/RoleMappingLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/RoleMappingLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/RoleMappingLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -25,11 +25,8 @@
import java.security.acl.Group;
import java.util.Enumeration;
import java.util.Iterator;
-import java.util.Map;
import java.util.Properties;
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
@@ -59,18 +56,8 @@
* Should the matching role be replaced
*/
protected boolean REPLACE_ROLE = false;
-
+
/**
- * @see LoginModule#initialize(javax.security.auth.Subject,
- * javax.security.auth.callback.CallbackHandler, java.util.Map, java.util.Map)
- */
- public void initialize(Subject subject, CallbackHandler handler,
- Map sharedState, Map options)
- {
- super.initialize(subject, handler, sharedState, options);
- }
-
- /**
* @see LoginModule#login()
*/
public boolean login() throws LoginException
@@ -88,10 +75,10 @@
protected Principal getIdentity()
{
//We have an authenticated subject
- Iterator iter = subject.getPrincipals().iterator();
+ Iterator<? extends Principal> iter = subject.getPrincipals().iterator();
while(iter.hasNext())
{
- Principal p = (Principal)iter.next();
+ Principal p = iter.next();
if(p instanceof Group == false)
return p;
}
@@ -150,7 +137,7 @@
*/
private Group getExistingRolesFromSubject()
{
- Iterator iter = subject.getPrincipals().iterator();
+ Iterator<? extends Principal> iter = subject.getPrincipals().iterator();
while(iter.hasNext())
{
Principal p = (Principal)iter.next();
@@ -172,7 +159,7 @@
*/
private void processRoles(Group group,Properties props) throws Exception
{
- Enumeration enumer = props.propertyNames();
+ Enumeration<?> enumer = props.propertyNames();
while(enumer.hasMoreElements())
{
String roleKey = (String)enumer.nextElement();
@@ -184,4 +171,4 @@
group.removeMember(pIdentity);
}
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/RunAsLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/RunAsLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/RunAsLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -47,7 +47,7 @@
* run-as role. If not specified a default role name of nobody is used.
*/
public void initialize(Subject subject, CallbackHandler handler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
roleName = (String) options.get("roleName");
if( roleName == null )
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/SecurityActions.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/SecurityActions.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -30,7 +30,6 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-//$Id$
/**
* Privileged Blocks
@@ -42,9 +41,9 @@
{
static ClassLoader getContextClassLoader()
{
- return (ClassLoader) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
{
- public Object run()
+ public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
}
@@ -53,9 +52,9 @@
static URL findResource(final URLClassLoader cl, final String name)
{
- return (URL) AccessController.doPrivileged(new PrivilegedAction()
+ return AccessController.doPrivileged(new PrivilegedAction<URL>()
{
- public Object run()
+ public URL run()
{
return cl.findResource(name);
}
@@ -64,9 +63,9 @@
static InputStream openStream(final URL url) throws PrivilegedActionException
{
- return (InputStream) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<InputStream>()
{
- public Object run() throws IOException
+ public InputStream run() throws IOException
{
return url.openStream();
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsernamePasswordLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -106,7 +106,7 @@
hashAlgorithm has been specified.
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
super.initialize(subject, callbackHandler, sharedState, options);
@@ -143,6 +143,7 @@
/** Perform the authentication of the username and password.
*/
+ @SuppressWarnings("unchecked")
public boolean login() throws LoginException
{
// See if shared credentials exist
@@ -333,6 +334,7 @@
* @throws SecurityException - thrown if there is a failure to load the
* digestOption DigestCallback
*/
+ @SuppressWarnings("unchecked")
protected String createPasswordHash(String username, String password,
String digestOption)
throws LoginException
@@ -343,7 +345,7 @@
try
{
// Try to invoke the subclass createPasswordHash(String, String)
- Class[] sig = {String.class, String.class};
+ Class<?>[] sig = {String.class, String.class};
Method createPasswordHash = getClass().getMethod("createPasswordHash", sig);
Object[] args = {username, password};
String passwordHash = (String) createPasswordHash.invoke(this, args);
@@ -370,7 +372,7 @@
try
{
ClassLoader loader = SecurityActions.getContextClassLoader();
- Class callbackClass = loader.loadClass(callbackClassName);
+ Class<?> callbackClass = loader.loadClass(callbackClassName);
callback = (DigestCallback) callbackClass.newInstance();
if( log.isTraceEnabled() )
log.trace("Created DigestCallback: "+callback);
@@ -383,7 +385,7 @@
ex.initCause(e);
throw ex;
}
- Map tmp = new HashMap();
+ Map<String,Object> tmp = new HashMap<String,Object>();
tmp.putAll(options);
tmp.put("javax.security.auth.login.name", username);
tmp.put("javax.security.auth.login.password", password);
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/Users.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/Users.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/Users.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -39,14 +39,14 @@
*/
public class Users
{
- private HashMap users = new HashMap();
+ private HashMap<String,User> users = new HashMap<String,User>();
- public static class User implements Comparable
+ public static class User implements Comparable<User>
{
private String name;
private String password;
private String encoding;
- private HashMap roleGroups = new HashMap();
+ private HashMap<String,Group> roleGroups = new HashMap<String,Group>();
public User()
{
@@ -81,6 +81,7 @@
this.encoding = encoding;
}
+ @SuppressWarnings("unchecked")
public Group[] getRoleSets()
{
Group[] roleSets = new Group[roleGroups.size()];
@@ -97,11 +98,11 @@
String[] names = {};
if( group != null )
{
- ArrayList tmp = new ArrayList();
- Enumeration iter = group.members();
+ ArrayList<String> tmp = new ArrayList<String>();
+ Enumeration<? extends Principal> iter = group.members();
while( iter.hasMoreElements() )
{
- Principal p = (Principal) iter.nextElement();
+ Principal p = iter.nextElement();
tmp.add(p.getName());
}
names = new String[tmp.size()];
@@ -120,10 +121,9 @@
SimplePrincipal role = new SimplePrincipal(roleName);
group.addMember(role);
}
- public int compareTo(Object obj)
+ public int compareTo(User obj)
{
- User u = (User) obj;
- return name.compareTo(u.name);
+ return name.compareTo(obj.name);
}
public String toString()
@@ -141,7 +141,7 @@
{
users.put(user.getName(), user);
}
- public Iterator getUsers()
+ public Iterator<User> getUsers()
{
return users.values().iterator();
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsersLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsersLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsersLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -65,7 +65,8 @@
* usersProperties: The name of the properties resource containing
* user/passwords. The default is "users.properties"
*/
- public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options)
+ public void initialize(Subject subject, CallbackHandler callbackHandler,
+ Map<String,?> sharedState, Map<String,?> options)
{
super.initialize(subject, callbackHandler, sharedState, options);
try
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsersRolesLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsersRolesLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/UsersRolesLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -102,7 +102,7 @@
defaultRoles.properties.
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
super.initialize(subject, callbackHandler, sharedState, options);
try
@@ -195,7 +195,7 @@
* @return Properties map used for the username/password mapping.
* @throws IOException - thrown on failure to load the properties
*/
- protected Properties createUsers(Map options) throws IOException
+ protected Properties createUsers(Map<String,?> options) throws IOException
{
loadUsers();
return this.users;
@@ -221,7 +221,7 @@
* @return Properties map used for the username/roles mapping.
* @throws IOException - thrown on failure to load the properties
*/
- protected Properties createRoles(Map options) throws IOException
+ protected Properties createRoles(Map<String,?> options) throws IOException
{
loadRoles();
return this.roles;
@@ -241,4 +241,4 @@
Util.parseGroupMembers(group, roles, this);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/XMLLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/XMLLoginModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/auth/spi/XMLLoginModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -76,7 +76,7 @@
user/passwords. The default is "users.properties"
*/
public void initialize(Subject subject, CallbackHandler callbackHandler,
- Map sharedState, Map options)
+ Map<String,?> sharedState, Map<String,?> options)
{
super.initialize(subject, callbackHandler, sharedState, options);
try
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/AuthorizationInfoContainer.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/AuthorizationInfoContainer.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/AuthorizationInfoContainer.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -28,6 +28,7 @@
import org.jboss.logging.Logger;
import org.jboss.security.authorization.config.AuthorizationConfigEntryHolder;
+import org.jboss.security.authorization.config.AuthorizationModuleEntry;
import org.jboss.security.config.AuthorizationInfo;
import org.jboss.xb.binding.GenericValueContainer;
@@ -48,7 +49,7 @@
String authName = null;
- List moduleEntries = new ArrayList();
+ List<AuthorizationModuleEntry> moduleEntries = new ArrayList<AuthorizationModuleEntry>();
public void addChild(QName name, Object value)
{
@@ -71,9 +72,8 @@
return info;
}
- public Class getTargetClass()
+ public Class<?> getTargetClass()
{
return AuthorizationInfo.class;
}
-
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/SecurityActions.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/SecurityActions.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -34,10 +34,10 @@
*/
class SecurityActions
{
- private static class GetTCLAction implements PrivilegedAction
+ private static class GetTCLAction implements PrivilegedAction<ClassLoader>
{
- static PrivilegedAction ACTION = new GetTCLAction();
- public Object run()
+ static PrivilegedAction<ClassLoader> ACTION = new GetTCLAction();
+ public ClassLoader run()
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
return loader;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationConfigEntryHolder.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationConfigEntryHolder.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/config/AuthorizationConfigEntryHolder.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -40,7 +40,7 @@
*/
public class AuthorizationConfigEntryHolder implements GenericValueContainer
{
- private Map moduleOptions = new HashMap();
+ private Map<String,Object> moduleOptions = new HashMap<String,Object>();
String moduleName = null;
ControlFlag controlFlag = ControlFlag.REQUIRED;
@@ -86,9 +86,9 @@
return entry;
}
- public Class getTargetClass()
+ public Class<?> getTargetClass()
{
return AuthorizationModuleEntry.class;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -61,8 +61,7 @@
private String methodInterface = null;
private CodeSource ejbCS = null;
private String roleName = null;
- private Boolean roleRefCheck = Boolean.FALSE;
- //private Group securityContextRoles = null;
+ private Boolean roleRefCheck = Boolean.FALSE;
public EJBJACCPolicyModuleDelegate()
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/authorization/modules/ejb/EJBPolicyModuleDelegate.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -59,8 +59,7 @@
{
private String ejbName = null;
private Method ejbMethod = null;
- private Principal ejbPrincipal = null;
- //private Set<Principal> methodRoles = null;
+ private Principal ejbPrincipal = null;
private RoleGroup methodRoles = null;
private String methodInterface = null;
private RunAs callerRunAs = null;
@@ -89,13 +88,7 @@
//Get the context map
Map<String,Object> map = resource.getMap();
if(map == null)
- throw new IllegalStateException("Map from the Resource is null");
-
- /*AuthorizationManager am = (AuthorizationManager) map.get("authorizationManager");
- if(am == null)
- throw new IllegalStateException("Authorization Manager is null");
- if(am instanceof PolicyRegistration)
- this.policyRegistration = (PolicyRegistration) am; */
+ throw new IllegalStateException("Map from the Resource is null");
this.policyRegistration = (PolicyRegistration) map.get(ResourceKeys.POLICY_REGISTRATION);
@@ -147,8 +140,7 @@
}
// Check if the caller is allowed to access the method
- if(methodRoles.containsAll(ANYBODY_ROLE) == false)
- //if (methodRoles.contains(AnybodyPrincipal.ANYBODY_PRINCIPAL) == false)
+ if(methodRoles.containsAll(ANYBODY_ROLE) == false)
{
// The caller is using a the caller identity
if (callerRunAs == null)
@@ -172,24 +164,7 @@
if(trace)
log.trace("Exception:"+msg);
allowed = false;
- }
-
- /*// Now actually check if the current caller has one of the required method roles
- if (am.doesUserHaveRole(ejbPrincipal, methodRoles) == false)
- {
- if(this.ejbMethod == null)
- throw new IllegalStateException("ejbMethod is null");
-
- Set<Principal> userRoles = am.getUserRoles(ejbPrincipal);
- String method = this.ejbMethod.getName();
- String msg = "Insufficient method permissions, principal=" + ejbPrincipal
- + ", ejbName=" + this.ejbName
- + ", method=" + method + ", interface=" + this.methodInterface
- + ", requiredRoles=" + methodRoles + ", principalRoles=" + userRoles;
- if(trace)
- log.trace("Exception:"+msg);
- allowed = false;
- }*/
+ }
}
// The caller is using a run-as identity
@@ -212,21 +187,7 @@
if(trace)
log.trace("Exception:"+msg);
allowed = false;
- }
-
- /*// Check that the run-as role is in the set of method roles
- if (callerRunAsIdentity.doesUserHaveRole(methodRoles) == false)
- {
- String method = this.ejbMethod.getName();
- String msg = "Insufficient method permissions, principal=" + ejbPrincipal
- + ", ejbName=" + this.ejbName
- + ", method=" + method + ", interface=" + this.methodInterface
- + ", requiredRoles=" + methodRoles + ", runAsRoles="
- + callerRunAsIdentity.getRunAsRoles();
- if(trace)
- log.trace("Exception:"+msg);
- allowed = false;
- }*/
+ }
}
}
@@ -269,16 +230,12 @@
if (!matchFound)
log.trace("no match found for security role " + roleName +
" in the deployment descriptor for ejb " + this.ejbName);
-
- /*HashSet<Principal> set = new HashSet<Principal>();
- set.add(new SimplePrincipal(roleName));*/
-
+
Role deploymentrole = new SimpleRole(roleName);
boolean allowed = false;
if (callerRunAs == null)
allowed = principalRole.containsRole(deploymentrole);
- //allowed = am.doesUserHaveRole(ejbPrincipal, set);
else
{
if(callerRunAs instanceof RunAsIdentity)
@@ -286,7 +243,6 @@
RunAsIdentity callerRunAsIdentity = (RunAsIdentity) callerRunAs;
SimpleRoleGroup srg = new SimpleRoleGroup(callerRunAsIdentity.getRunAsRoles());
allowed = srg.containsRole(deploymentrole);
- //allowed = callerRunAsIdentity.doesUserHaveRole(set);
}
}
return allowed ? AuthorizationContext.PERMIT : AuthorizationContext.DENY;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/cache/JBossAuthenticationCache.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/cache/JBossAuthenticationCache.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/cache/JBossAuthenticationCache.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -29,9 +29,8 @@
import javax.security.auth.Subject;
import org.jboss.security.SecurityConstants;
+
-//$Id$
-
/**
* Authentication Cache keyed in by Principal
* @author Anil.Saldhana at redhat.com
@@ -93,6 +92,7 @@
/**
* @see SecurityCache#cacheOperation(Object, Map)
*/
+ @SuppressWarnings("unchecked")
public void cacheOperation(Principal principal, Map<String,Object> map)
throws SecurityCacheException
{
@@ -163,6 +163,7 @@
/**
* @see SecurityCache#get(Object)
*/
+ @SuppressWarnings("unchecked")
public <Y> Y get(Principal key) throws SecurityCacheException
{
Subject subj = null;
@@ -194,4 +195,4 @@
}
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/JBossIdentityTrustContext.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -34,9 +34,7 @@
import org.jboss.security.config.SecurityConfiguration;
import org.jboss.security.identitytrust.IdentityTrustManager.TrustDecision;
import org.jboss.security.identitytrust.config.IdentityTrustModuleEntry;
-
-//$Id$
-
+
/**
* Implementation of the Identity Trust Context
* @author Anil.Saldhana at redhat.com
@@ -69,9 +67,9 @@
//Do a PrivilegedAction
try
{
- decision = (TrustDecision) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ decision = AccessController.doPrivileged(new PrivilegedExceptionAction<TrustDecision>()
{
- public Object run() throws IdentityTrustException
+ public TrustDecision run() throws IdentityTrustException
{
TrustDecision result = invokeTrusted();
if(result == PERMIT)
@@ -118,6 +116,7 @@
}
}
+ @SuppressWarnings("unchecked")
private IdentityTrustModule instantiateModule(String name, Map map) throws Exception
{
IdentityTrustModule im = null;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/SecurityActions.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/SecurityActions.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -25,7 +25,6 @@
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-//$Id$
/**
* Privileged Blocks
@@ -37,20 +36,20 @@
{
static ClassLoader getContextClassLoader() throws PrivilegedActionException
{
- return (ClassLoader) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<ClassLoader>()
{
- public Object run()
+ public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
}
});
}
- static Class loadClass(final String name) throws PrivilegedActionException
+ static Class<?> loadClass(final String name) throws PrivilegedActionException
{
- return (Class) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>()
{
- public Object run() throws PrivilegedActionException
+ public Class<?> run() throws PrivilegedActionException
{
try
{
@@ -62,5 +61,4 @@
}
}
});
- }
-}
\ No newline at end of file
+ }}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/modules/AbstractIdentityTrustModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/modules/AbstractIdentityTrustModule.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/identitytrust/modules/AbstractIdentityTrustModule.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -30,7 +30,6 @@
import org.jboss.security.identitytrust.IdentityTrustModule;
import org.jboss.security.identitytrust.IdentityTrustManager.TrustDecision;
-//$Id$
/**
* Abstract IdentityTrustModule that pulls in common stuff
@@ -42,8 +41,8 @@
{
protected SecurityContext securityContext;
protected CallbackHandler callbackHandler;
- protected Map sharedState;
- protected Map options;
+ protected Map<String,Object> sharedState;
+ protected Map<String,Object> options;
/**
* @see IdentityTrustModule#abort()
@@ -65,7 +64,8 @@
* @see IdentityTrustModule#initialize(SecurityContext, CallbackHandler, Map, Map)
*/
public void initialize(SecurityContext sc,
- CallbackHandler handler, Map sharedState, Map options)
+ CallbackHandler handler, Map<String,Object> sharedState
+ , Map<String,Object> options)
throws IdentityTrustException
{
this.securityContext = sc;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/RoleMappingConfigContainer.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/RoleMappingConfigContainer.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/config/RoleMappingConfigContainer.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -44,7 +44,7 @@
{
private static Logger log = Logger.getLogger(RoleMappingConfigContainer.class);
- private List moduleEntries = new ArrayList();
+ private List<MappingModuleEntry> moduleEntries = new ArrayList<MappingModuleEntry>();
/**
* @see GenericValueContainer#addChild(javax.xml.namespace.QName, java.lang.Object)
@@ -55,7 +55,8 @@
log.trace("addChild:Qname="+name+":value="+value);
if(value instanceof MappingModuleEntry)
{
- this.moduleEntries.add(value);
+ MappingModuleEntry mme = (MappingModuleEntry) value;
+ this.moduleEntries.add(mme);
}
}
@@ -76,7 +77,7 @@
/**
* @see GenericValueContainer#getTargetClass()
*/
- public Class getTargetClass()
+ public Class<?> getTargetClass()
{
return RoleMappingInfo.class;
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/DeploymentRolesMappingProvider.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -33,9 +33,8 @@
import org.jboss.security.identity.plugins.SimpleRoleGroup;
import org.jboss.security.mapping.MappingProvider;
import org.jboss.security.mapping.MappingResult;
+
-//$Id$
-
/**
* A Role Mapping Module that takes into consideration a principal
* to roles mapping that can be done in the assembly descriptor of
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/MappingProviderUtil.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/MappingProviderUtil.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/MappingProviderUtil.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -30,9 +30,7 @@
import org.jboss.logging.Logger;
import org.jboss.security.SimplePrincipal;
-
-//$Id$
-
+
/**
* Utility class for Mapping Providers
* @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/SecurityActions.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/SecurityActions.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -30,9 +30,7 @@
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-
-//$Id$
-
+
/**
* Privileged Blocks
* @author Anil.Saldhana at redhat.com
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/principal/SubjectCNMapper.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/principal/SubjectCNMapper.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/principal/SubjectCNMapper.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -46,20 +46,18 @@
public class SubjectCNMapper implements MappingProvider<Principal>
{
private static final Logger log = Logger.getLogger(SubjectCNMapper.class);
- private Map options = null;
private MappingResult<Principal> result;
- public void init(Map opt)
+ public void init(Map<String,Object> opt)
{
- this.options = opt;
}
- public void setMappingResult(MappingResult res)
+ public void setMappingResult(MappingResult<Principal> res)
{
result = res;
}
- public void performMapping(Map contextMap, Principal principal)
+ public void performMapping(Map<String,Object> contextMap, Principal principal)
{
if(principal instanceof X500Principal == false)
return;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/principal/SubjectDNMapper.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/principal/SubjectDNMapper.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/mapping/providers/principal/SubjectDNMapper.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -29,9 +29,8 @@
import org.jboss.security.auth.certs.SubjectDNMapping;
import org.jboss.security.mapping.MappingProvider;
import org.jboss.security.mapping.MappingResult;
+
-//$Id$
-
/**
* A X500 Principal Mapper from a X509 Certificate
* that considers SubjectDN of the Client certificate
@@ -43,21 +42,19 @@
*/
public class SubjectDNMapper implements MappingProvider<Principal>
{
- private static final Logger log = Logger.getLogger(SubjectDNMapper.class);
- private Map options = null;
+ private static final Logger log = Logger.getLogger(SubjectDNMapper.class);
private MappingResult<Principal> result;
- public void init(Map opt)
- {
- this.options = opt;
+ public void init(Map<String,Object> opt)
+ {
}
- public void setMappingResult(MappingResult res)
+ public void setMappingResult(MappingResult<Principal> res)
{
result = res;
}
- public void performMapping(Map contextMap, Principal principal)
+ public void performMapping(Map<String,Object> contextMap, Principal principal)
{
if(contextMap == null)
throw new IllegalArgumentException("ContextMap is null");
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossSecurityContextUtil.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossSecurityContextUtil.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/JBossSecurityContextUtil.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -81,7 +81,7 @@
SubjectInfo subjectInfo = this.securityContext.getSubjectInfo();
if(subjectInfo != null)
{
- CredentialIdentity cIdentity = subjectInfo.getIdentity(CredentialIdentity.class);
+ CredentialIdentity<?> cIdentity = subjectInfo.getIdentity(CredentialIdentity.class);
p = cIdentity != null ? cIdentity.asPrincipal() : null;
}
return p;
@@ -94,7 +94,7 @@
SubjectInfo subjectInfo = this.securityContext.getSubjectInfo();
if(subjectInfo != null)
{
- CredentialIdentity cIdentity = subjectInfo.getIdentity(CredentialIdentity.class);
+ CredentialIdentity<?> cIdentity = subjectInfo.getIdentity(CredentialIdentity.class);
cred = cIdentity != null ? cIdentity.getCredential(): null;
}
return cred;
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/audit/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/audit/SecurityActions.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/audit/SecurityActions.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -24,9 +24,7 @@
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-
-//$Id$
-
+
/**
* Privileged Blocks
* @author Anil.Saldhana at redhat.com
@@ -37,20 +35,20 @@
{
static ClassLoader getContextClassLoader() throws PrivilegedActionException
{
- return (ClassLoader) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<ClassLoader>()
{
- public Object run()
+ public ClassLoader run()
{
return Thread.currentThread().getContextClassLoader();
}
});
}
- static Class loadClass(final String name) throws PrivilegedActionException
+ static Class<?> loadClass(final String name) throws PrivilegedActionException
{
- return (Class) AccessController.doPrivileged(new PrivilegedExceptionAction()
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>()
{
- public Object run() throws PrivilegedActionException
+ public Class<?> run() throws PrivilegedActionException
{
try
{
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -189,7 +189,7 @@
tmp.append(",credential.class=");
if( credential != null )
{
- Class c = credential.getClass();
+ Class<?> c = credential.getClass();
tmp.append(c.getName());
tmp.append('@');
tmp.append(System.identityHashCode(c));
@@ -249,7 +249,7 @@
this.trace = log.isTraceEnabled();
// Get the setSecurityInfo(Principal principal, Object credential) method
- Class[] sig = {Principal.class, Object.class};
+ Class<?>[] sig = {Principal.class, Object.class};
try
{
setSecurityInfo = handler.getClass().getMethod("setSecurityInfo", sig);
@@ -474,6 +474,7 @@
@return The Set<Principal> for the application domain roles that the
principal has been assigned.
*/
+ @SuppressWarnings("deprecation")
public Set<Principal> getUserRoles(Principal principal)
{
AuthorizationManager am = SecurityUtil.getAuthorizationManager(securityDomain,
@@ -732,17 +733,17 @@
/* Get the Subject callerPrincipal by looking for a Group called
'CallerPrincipal'
*/
- Set subjectGroups = subject.getPrincipals(Group.class);
- Iterator iter = subjectGroups.iterator();
+ Set<Group> subjectGroups = subject.getPrincipals(Group.class);
+ Iterator<Group> iter = subjectGroups.iterator();
while( iter.hasNext() )
{
- Group grp = (Group) iter.next();
+ Group grp = iter.next();
String name = grp.getName();
if( name.equals("CallerPrincipal") )
{
- Enumeration members = grp.members();
+ Enumeration<? extends Principal> members = grp.members();
if( members.hasMoreElements() )
- info.callerPrincipal = (Principal) members.nextElement();
+ info.callerPrincipal = members.nextElement();
}
}
@@ -753,11 +754,11 @@
*/
if( principal == null && info.callerPrincipal == null )
{
- Set subjectPrincipals = subject.getPrincipals(Principal.class);
- iter = subjectPrincipals.iterator();
- while( iter.hasNext() )
+ Set<Principal> subjectPrincipals = subject.getPrincipals(Principal.class);
+ Iterator<? extends Principal> iterPrincipals = subjectPrincipals.iterator();
+ while( iterPrincipals.hasNext() )
{
- Principal p = (Principal) iter.next();
+ Principal p = iterPrincipals.next();
if( (p instanceof Group) == false )
info.callerPrincipal = p;
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/SubjectActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/SubjectActions.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/auth/SubjectActions.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -89,7 +89,7 @@
}
}
- private static class CopySubjectAction implements PrivilegedAction
+ private static class CopySubjectAction implements PrivilegedAction<Object>
{
Subject fromSubject;
Subject toSubject;
@@ -137,11 +137,11 @@
Object clonedObject = null;
if(this.deepCopy && obj instanceof Cloneable)
{
- Class clazz = obj.getClass();
+ Class<?> clazz = obj.getClass();
try
{
- Method cloneMethod = clazz.getMethod("clone", null);
- clonedObject = cloneMethod.invoke(obj, null);
+ Method cloneMethod = clazz.getMethod("clone", (Class[])null);
+ clonedObject = cloneMethod.invoke(obj, (Object[])null);
}
catch (Exception e)
{//Ignore non-cloneable issues
@@ -153,7 +153,7 @@
}
}
- private static class LoginContextAction implements PrivilegedExceptionAction
+ private static class LoginContextAction implements PrivilegedExceptionAction<LoginContext>
{
String securityDomain;
Subject subject;
@@ -165,24 +165,24 @@
this.subject = subject;
this.handler = handler;
}
- public Object run() throws Exception
+ public LoginContext run() throws Exception
{
LoginContext lc = new LoginContext(securityDomain, subject, handler);
return lc;
}
}
- private static class GetTCLAction implements PrivilegedAction
+ private static class GetTCLAction implements PrivilegedAction<ClassLoader>
{
- static PrivilegedAction ACTION = new GetTCLAction();
- public Object run()
+ static PrivilegedAction<ClassLoader> ACTION = new GetTCLAction();
+ public ClassLoader run()
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
return loader;
}
}
- private static class SetContextInfoAction implements PrivilegedAction
+ private static class SetContextInfoAction implements PrivilegedAction<Object>
{
String key;
Object value;
@@ -211,11 +211,10 @@
final Subject subject, final String securityDomain)
{
AccessController.doPrivileged(
- new PrivilegedAction()
+ new PrivilegedAction<Object>()
{
public Object run()
{
- //SecurityAssociation.pushSubjectContext(subject, principal, credential);
SecurityContext sc = SecurityContextAssociation.getSecurityContext();
if(sc == null)
{
@@ -238,7 +237,7 @@
public void pop()
{
AccessController.doPrivileged(
- new PrivilegedAction()
+ new PrivilegedAction<Object>()
{
public Object run()
{
@@ -278,7 +277,6 @@
}
public void pop()
{
- //SecurityAssociation.popSubjectContext();
SecurityContextAssociation.clearSecurityContext();
}
};
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/mapping/JBossMappingManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/mapping/JBossMappingManager.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/mapping/JBossMappingManager.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -35,7 +35,6 @@
import org.jboss.security.mapping.config.MappingModuleEntry;
import org.jboss.security.plugins.JBossSecurityContext;
-//$Id$
/**
* JBoss implementation of Mapping Manager
@@ -76,17 +75,8 @@
+ securityDomain);
MappingContext<T> mc = null;
- MappingInfo rmi = aPolicy.getMappingInfo(mappingType);
+ MappingInfo rmi = aPolicy.getMappingInfo(mappingType);
- /*if(mappingType == Group.class)
- {
- rmi = aPolicy.getRoleMappingInfo();
- }
- else if(mappingType == Principal.class)
- {
- rmi = aPolicy.getPrincipalMappingInfo();
- }*/
-
if(rmi != null)
{
MappingModuleEntry[] mpe = rmi.getMappingModuleEntry();
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/mapping/SecurityActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/mapping/SecurityActions.java 2008-05-20 12:24:56 UTC (rev 73519)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/org/jboss/security/plugins/mapping/SecurityActions.java 2008-05-20 12:27:24 UTC (rev 73520)
@@ -25,9 +25,7 @@
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-
-//$Id$
-
+
/**
* Privileged Blocks
* @author Anil.Saldhana at redhat.com
More information about the jboss-cvs-commits
mailing list