[jboss-cvs] JBossAS SVN: r93322 - in projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss: security and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 9 13:44:16 EDT 2009
Author: anil.saldhana at jboss.com
Date: 2009-09-09 13:44:15 -0400 (Wed, 09 Sep 2009)
New Revision: 93322
Modified:
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/CallerIdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/ConfiguredIdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/JaasSecurityDomainIdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/PBEIdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/SecureIdentityLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/AltClientLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/ClientLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SecurityAssociation.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/audit/providers/LogAuditProvider.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/container/modules/AbstractServerAuthModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/login/XMLLoginConfigImpl.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/BaseCertLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/CertRolesLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/DatabaseCertLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/DatabaseServerLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/UsersObjectModelFactory.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/Util.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/identitytrust/JBossIdentityTrustContext.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/jacc/ContextPolicy.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/jacc/DelegatingPolicy.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/providers/attribute/LdapAttributeMappingProvider.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/JBossPolicyRegistration.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/SubjectActions.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/TransactionManagerLocator.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/auth/JASPIServerAuthenticationManager.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/identitytrust/JBossIdentityTrustManager.java
projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/mapping/JBossMappingManager.java
Log:
SECURITY-434: ensure log.isTraceEnabled wrapping usage for trace log
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/CallerIdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/CallerIdentityLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/CallerIdentityLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -60,6 +60,8 @@
*/
private static final Logger log = Logger.getLogger(CallerIdentityLoginModule.class);
+ private boolean trace = log.isTraceEnabled();
+
/**
* The default username/principal to use for basic connections
*/
@@ -132,7 +134,8 @@
*/
public boolean login() throws LoginException
{
- log.trace("Caller Association login called");
+ if(trace)
+ log.trace("Caller Association login called");
//setup to use the default connection info. This will be overiden if security
//associations are found
@@ -152,7 +155,7 @@
if (user != null)
{
username = user.getName();
- if (log.isTraceEnabled())
+ if (trace)
{
log.trace("Current Calling principal is: " + username
+ " ThreadName: " + Thread.currentThread().getName());
@@ -203,14 +206,16 @@
protected Principal getIdentity()
{
- log.trace("getIdentity called");
+ if(trace)
+ log.trace("getIdentity called");
Principal principal = new SimplePrincipal(userName);
return principal;
}
protected Group[] getRoleSets() throws LoginException
{
- log.trace("getRoleSets called");
+ if(trace)
+ log.trace("getRoleSets called");
return new Group[]{};
}
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/ConfiguredIdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/ConfiguredIdentityLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/ConfiguredIdentityLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -59,6 +59,7 @@
private String password;
private static final Logger log = Logger.getLogger(ConfiguredIdentityLoginModule.class);
+ private boolean trace = log.isTraceEnabled();
public ConfiguredIdentityLoginModule()
@@ -84,13 +85,15 @@
log.warn("Creating LoginModule with no configured password!");
password = "";
}
- log.trace("got principal: " + principalName + ", username: " + userName + ", password: " + password);
+ if(trace)
+ log.trace("got principal: " + principalName + ", username: " + userName + ", password: " + password);
}
public boolean login() throws LoginException
{
- log.trace("login called");
+ if(trace)
+ log.trace("login called");
if( super.login() == true )
return true;
@@ -107,7 +110,8 @@
protected Principal getIdentity()
{
- log.trace("getIdentity called");
+ if(trace)
+ log.trace("getIdentity called");
Principal principal = new SimplePrincipal(principalName);
return principal;
}
@@ -117,8 +121,9 @@
*/
protected Group[] getRoleSets() throws LoginException
{
- log.trace("getRoleSets called");
+ if(trace)
+ log.trace("getRoleSets called");
return new Group[] {};
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/JaasSecurityDomainIdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/JaasSecurityDomainIdentityLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/JaasSecurityDomainIdentityLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -83,7 +83,8 @@
extends AbstractPasswordCredentialLoginModule
{
private static final Logger log = Logger.getLogger(JaasSecurityDomainIdentityLoginModule.class);
-
+ private boolean trace = log.isTraceEnabled();
+
private String username;
private String password;
private ObjectName jaasSecurityDomain;
@@ -128,7 +129,8 @@
public boolean login() throws LoginException
{
- log.trace("login called");
+ if(trace)
+ log.trace("login called");
if( super.login() == true )
return true;
@@ -152,7 +154,8 @@
}
catch(Exception e)
{
- log.debug("Failed to decode password", e);
+ if(trace)
+ log.trace("Failed to decode password", e);
throw new LoginException("Failed to decode password: " + e.getMessage());
}
return true;
@@ -167,7 +170,8 @@
protected Principal getIdentity()
{
- log.trace("getIdentity called, username=" + username);
+ if(trace)
+ log.trace("getIdentity called, username=" + username);
Principal principal = new SimplePrincipal(username);
return principal;
}
@@ -224,4 +228,4 @@
}
}
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/PBEIdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/PBEIdentityLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/PBEIdentityLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -86,6 +86,7 @@
* Class logger
*/
private static final Logger log = Logger.getLogger(SecureIdentityLoginModule.class);
+ private boolean trace = log.isTraceEnabled();
private String username;
private String password;
@@ -158,7 +159,8 @@
public boolean login() throws LoginException
{
- log.trace("login called");
+ if(trace)
+ log.trace("login called");
if( super.login() == true )
return true;
@@ -182,7 +184,8 @@
}
catch(Exception e)
{
- log.debug("Failed to decode password", e);
+ if(trace)
+ log.trace("Failed to decode password", e);
throw new LoginException("Failed to decode password: "+e.getMessage());
}
return true;
@@ -197,7 +200,8 @@
protected Principal getIdentity()
{
- log.trace("getIdentity called, username="+username);
+ if(trace)
+ log.trace("getIdentity called, username="+username);
Principal principal = new SimplePrincipal(username);
return principal;
}
@@ -268,4 +272,4 @@
String encode = pbe.encode(args[0]);
System.out.println("Encoded password: "+encode);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/SecureIdentityLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/SecureIdentityLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/resource/security/SecureIdentityLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -71,6 +71,7 @@
* Class logger
*/
private static final Logger log = Logger.getLogger(SecureIdentityLoginModule.class);
+ private boolean trace = log.isTraceEnabled();
private String username;
private String password;
@@ -98,7 +99,8 @@
public boolean login() throws LoginException
{
- log.trace("login called");
+ if(trace)
+ log.trace("login called");
if( super.login() == true )
return true;
@@ -121,7 +123,8 @@
}
catch(Exception e)
{
- log.debug("Failed to decode password", e);
+ if(trace)
+ log.trace("Failed to decode password", e);
throw new LoginException("Failed to decode password: "+e.getMessage());
}
return true;
@@ -136,7 +139,8 @@
protected Principal getIdentity()
{
- log.trace("getIdentity called, username="+username);
+ if(trace)
+ log.trace("getIdentity called, username="+username);
Principal principal = new SimplePrincipal(username);
return principal;
}
@@ -201,4 +205,4 @@
String encode = encode(args[0]);
System.out.println("Encoded password: "+encode);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/AltClientLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/AltClientLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/AltClientLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -88,7 +88,7 @@
//log securityDomain, if set.
if(trace)
- log.trace("Security domain: " +
+ log.trace("Security domain: " +
(String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
// Check for multi-threaded option
@@ -110,7 +110,7 @@
String passwordStacking = (String) options.get("password-stacking");
useFirstPass = passwordStacking != null;
if(trace && useFirstPass)
- log.trace("Enabling useFirstPass mode");
+ log.trace("Enabling useFirstPass mode");
}
/**
@@ -218,4 +218,4 @@
SecurityAssociationActions.clear();
return true;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/ClientLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/ClientLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/ClientLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -104,7 +104,7 @@
//log securityDomain, if set.
if(trace)
- log.trace("Security domain: " +
+ log.trace("Security domain: " +
(String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
// Check for multi-threaded option
@@ -131,7 +131,7 @@
flag = (String) options.get("restore-login-identity");
restoreLoginIdentity = Boolean.valueOf(flag).booleanValue();
if(trace)
- log.trace("Enabling restore-login-identity mode");
+ log.trace("Enabling restore-login-identity mode");
/* Check for password sharing options. Any non-null value for
password_stacking sets useFirstPass as this module has no way to
@@ -140,7 +140,7 @@
String passwordStacking = (String) options.get("password-stacking");
useFirstPass = passwordStacking != null;
if(trace && useFirstPass)
- log.trace("Enabling useFirstPass mode");
+ log.trace("Enabling useFirstPass mode");
//Cache the existing security context
this.cachedSecurityContext = SecurityAssociationActions.getSecurityContext();
@@ -288,4 +288,4 @@
principals.remove(loginPrincipal);
return true;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SecurityAssociation.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SecurityAssociation.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/SecurityAssociation.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -1140,4 +1140,4 @@
}
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/audit/providers/LogAuditProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/audit/providers/LogAuditProvider.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/audit/providers/LogAuditProvider.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -27,13 +27,16 @@
public class LogAuditProvider extends AbstractAuditProvider
{
private static final Logger log = Logger.getLogger(LogAuditProvider.class);
+ private boolean trace = log.isTraceEnabled();
public void audit(AuditEvent auditEvent)
{
Exception e = auditEvent.getUnderlyingException();
if(e != null)
- log.trace(auditEvent, e);
+ if(trace)
+ log.trace(auditEvent, e);
else
- log.trace(auditEvent);
+ if(trace)
+ log.trace(auditEvent);
}
}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/container/modules/AbstractServerAuthModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/container/modules/AbstractServerAuthModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/container/modules/AbstractServerAuthModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -66,6 +66,7 @@
protected ArrayList<Class> supportedTypes = new ArrayList<Class>();
protected Logger log;
+ protected boolean trace = false;
/**
* @see ServerAuthModule#initialize(MessagePolicy, MessagePolicy, CallbackHandler, Map, boolean)
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/container/modules/DelegatingServerAuthModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -45,6 +45,7 @@
public DelegatingServerAuthModule()
{
log = Logger.getLogger(DelegatingServerAuthModule.class);
+ trace = log.isTraceEnabled();
this.supportedTypes.add(Object.class);
}
@@ -90,7 +91,8 @@
}
catch (Exception e)
{
- log.trace("Exception in validate:",e);
+ if(trace)
+ log.trace("Exception in validate:",e);
throw new AuthException(e.getLocalizedMessage());
}
}
@@ -108,4 +110,4 @@
}
return domainName;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/login/XMLLoginConfigImpl.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/login/XMLLoginConfigImpl.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/login/XMLLoginConfigImpl.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -66,6 +66,7 @@
private static final AuthPermission REFRESH_PERM = new AuthPermission("refreshLoginConfiguration");
private static Logger log = Logger.getLogger(XMLLoginConfigImpl.class);
+ private boolean trace = log.isTraceEnabled();
transient PolicyConfig appConfigs = new PolicyConfig();
@@ -396,8 +397,11 @@
}
catch (Throwable e)
{
- log.debug("Failed to load config as XML", e);
- log.debug("Try loading config as Sun format, url=" + config);
+ if(trace)
+ {
+ log.debug("Failed to load config as XML", e);
+ log.debug("Try loading config as Sun format, url=" + config);
+ }
loadSunConfig(config, configNames);
}
String[] names = new String[configNames.size()];
@@ -442,4 +446,4 @@
JBossXBParsingUtil xbUtil = new JBossXBParsingUtil();
xbUtil.parse(loginConfigURL, configNames);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/AbstractServerLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -79,6 +79,8 @@
@SuppressWarnings("unchecked")
protected Map options;
protected Logger log;
+ protected boolean trace = false;
+
/** Flag indicating if the shared credential should be used */
protected boolean useFirstPass;
/** Flag indicating if the login phase succeeded. Subclasses that override
@@ -120,12 +122,17 @@
this.sharedState = sharedState;
this.options = options;
log = Logger.getLogger(getClass());
- log.trace("initialize");
+ trace = log.isTraceEnabled();
+
+ if(trace)
+ {
+ log.trace("initialize");
- //log securityDomain, if set.
- log.trace("Security domain: " +
- (String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
-
+ //log securityDomain, if set.
+ log.trace("Security domain: " +
+ (String)options.get(SecurityConstants.SECURITY_DOMAIN_OPTION));
+ }
+
/* Check for password sharing options. Any non-null value for
password_stacking sets useFirstPass as this module has no way to
validate any shared password.
@@ -144,7 +151,8 @@
try
{
unauthenticatedIdentity = createIdentity(name);
- log.trace("Saw unauthenticatedIdentity="+name);
+ if(trace)
+ log.trace("Saw unauthenticatedIdentity="+name);
}
catch(Exception e)
{
@@ -164,7 +172,8 @@
*/
public boolean login() throws LoginException
{
- log.trace("login");
+ if(trace)
+ log.trace("login");
loginOk = false;
// If useFirstPass is true, look for the shared password
if( useFirstPass == true )
@@ -200,7 +209,8 @@
*/
public boolean commit() throws LoginException
{
- log.trace("commit, loginOk="+loginOk);
+ if(trace)
+ log.trace("commit, loginOk="+loginOk);
if( loginOk == false )
return false;
@@ -238,7 +248,8 @@
*/
public boolean abort() throws LoginException
{
- log.trace("abort");
+ if(trace)
+ log.trace("abort");
return true;
}
@@ -247,7 +258,8 @@
*/
public boolean logout() throws LoginException
{
- log.trace("logout");
+ if(trace)
+ log.trace("logout");
// Remove the user identity
Principal identity = getIdentity();
Set<Principal> principals = subject.getPrincipals();
@@ -339,4 +351,4 @@
}
return p;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/BaseCertLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/BaseCertLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/BaseCertLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -69,9 +69,7 @@
/** The SecurityDomain to obtain the KeyStore/TrustStore from */
private SecurityDomain domain = null;
/** An option certificate verifier */
- private X509CertificateVerifier verifier;
- /** The trace level log flag */
- private boolean trace;
+ private X509CertificateVerifier verifier;
/** Override the super version to pickup the following options after first
* calling the super method.
@@ -426,4 +424,4 @@
return isValid;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/CertRolesLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/CertRolesLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/CertRolesLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -56,9 +56,7 @@
/** The character used to seperate the role group name from the username
* e.g., '.' in jduke.CallerPrincipal=...
*/
- private char roleGroupSeperator = '.';
- /** Logging trace flag */
- private boolean trace;
+ private char roleGroupSeperator = '.';
/**
* Initialize this LoginModule.
@@ -142,4 +140,4 @@
roles = Util.loadProperties(defaultRolesRsrcName, rolesRsrcName, log);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/DatabaseCertLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/DatabaseCertLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/DatabaseCertLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -72,7 +72,7 @@
if( tmp != null )
suspendResume = Boolean.valueOf(tmp.toString()).booleanValue();
- if (log.isTraceEnabled())
+ if (trace)
{
log.trace("DatabaseServerLoginModule, dsJndiName="+dsJndiName);
log.trace("rolesQuery="+rolesQuery);
@@ -90,4 +90,4 @@
return roleSets;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/DatabaseServerLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/DatabaseServerLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/DatabaseServerLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -110,7 +110,7 @@
tmp = options.get("suspendResume");
if( tmp != null )
suspendResume = Boolean.valueOf(tmp.toString()).booleanValue();
- if (log.isTraceEnabled())
+ if (trace)
{
log.trace("DatabaseServerLoginModule, dsJndiName="+dsJndiName);
log.trace("principalsQuery="+principalsQuery);
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -190,9 +190,7 @@
protected int searchTimeLimit = 10000;
- protected int searchScope = SearchControls.SUBTREE_SCOPE;
-
- protected boolean trace;
+ protected int searchScope = SearchControls.SUBTREE_SCOPE;
// simple flag to indicate is the validatePassword method was called
protected boolean isPasswordValidated = false;
@@ -273,7 +271,8 @@
allowEmptyPasswords = Boolean.valueOf(flag).booleanValue();
if (allowEmptyPasswords == false)
{
- log.trace("Rejecting empty password due to allowEmptyPasswords");
+ if(trace)
+ log.trace("Rejecting empty password due to allowEmptyPasswords");
return false;
}
}
@@ -307,7 +306,8 @@
return;
}
Principal p = super.createIdentity(defaultRole);
- log.trace("Assign user to role " + defaultRole);
+ if(trace)
+ log.trace("Assign user to role " + defaultRole);
userRoles.addMember(p);
}
catch (Exception e)
@@ -507,7 +507,8 @@
// Query the roleDN location for the value of roleNameAttributeID
String roleDN = roleName;
String[] returnAttribute = {roleNameAttributeID};
- log.trace("Using roleDN: " + roleDN);
+ if(trace)
+ log.trace("Using roleDN: " + roleDN);
try
{
Attributes result2 = ctx.getAttributes(roleDN, returnAttribute);
@@ -523,7 +524,8 @@
}
catch (NamingException e)
{
- log.trace("Failed to query roleNameAttrName", e);
+ if(trace)
+ log.trace("Failed to query roleNameAttrName", e);
}
}
else
@@ -619,13 +621,15 @@
try
{
Principal p = super.createIdentity(roleName);
- log.trace("Assign user to role " + roleName);
+ if(trace)
+ log.trace("Assign user to role " + roleName);
userRoles.addMember(p);
}
catch (Exception e)
{
- log.debug("Failed to create principal: " + roleName, e);
+ if(trace)
+ log.debug("Failed to create principal: " + roleName, e);
}
}
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/UsersObjectModelFactory.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/UsersObjectModelFactory.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/UsersObjectModelFactory.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -33,7 +33,8 @@
public class UsersObjectModelFactory implements ObjectModelFactory
{
private static Logger log = Logger.getLogger(UsersObjectModelFactory.class);
-
+ private boolean trace = log.isTraceEnabled();
+
public Object newRoot(Object root, UnmarshallingContext navigator,
String namespaceURI, String localName, Attributes attrs)
{
@@ -41,7 +42,8 @@
{
throw new IllegalStateException("Unexpected root element: was expecting 'users' but got '" + localName + "'");
}
- log.trace("newRoot, root="+root);
+ if(trace)
+ log.trace("newRoot, root="+root);
return new Users();
}
@@ -67,7 +69,8 @@
child.setPassword(password);
String encoding = attrs.getValue("encoding");
child.setEncoding(encoding);
- log.trace("newChild, user="+child);
+ if(trace)
+ log.trace("newChild, user="+child);
}
return child;
}
@@ -97,4 +100,4 @@
{
user.addRole(roleInfo[0], roleInfo[1]);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/Util.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/Util.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/auth/spi/Util.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -51,7 +51,7 @@
*/
public class Util
{
- private static Logger log = Logger.getLogger(Util.class);
+ private static Logger log = Logger.getLogger(Util.class);
public static final String BASE64_ENCODING = "BASE64";
public static final String BASE16_ENCODING = "HEX";
@@ -174,6 +174,8 @@
static Properties loadProperties(String defaultsName, String propertiesName, Logger log)
throws IOException
{
+ boolean trace = log.isTraceEnabled();
+
Properties bundle = null;
ClassLoader loader = SecurityActions.getContextClassLoader();
URL defaultUrl = null;
@@ -184,7 +186,8 @@
URLClassLoader ucl = (URLClassLoader) loader;
defaultUrl = SecurityActions.findResource(ucl,defaultsName);
url = SecurityActions.findResource(ucl,propertiesName);
- log.trace("findResource: "+url);
+ if(log.isTraceEnabled())
+ log.trace("findResource: "+url);
}
// Do a general resource search
if( defaultUrl == null )
@@ -198,7 +201,8 @@
throw new IOException(msg);
}
- log.trace("Properties file=" + url+", defaults="+defaultUrl);
+ if(log.isTraceEnabled())
+ log.trace("Properties file=" + url+", defaults="+defaultUrl);
Properties defaults = new Properties();
if( defaultUrl != null )
{
@@ -207,11 +211,13 @@
InputStream is = defaultUrl.openStream();
defaults.load(is);
is.close();
- log.debug("Loaded defaults, users="+defaults.keySet());
+ if(trace)
+ log.debug("Loaded defaults, users="+defaults.keySet());
}
catch(Throwable e)
{
- log.debug("Failed to load defaults", e);
+ if(trace)
+ log.debug("Failed to load defaults", e);
}
}
@@ -225,7 +231,8 @@
}
catch (PrivilegedActionException e)
{
- log.trace("Open stream error", e);
+ if(trace)
+ log.trace("Open stream error", e);
throw new IOException(e.getLocalizedMessage());
}
if (is != null)
@@ -237,7 +244,8 @@
{
throw new IOException("Properties file " + propertiesName + " not avilable");
}
- log.debug("Loaded properties, users="+bundle.keySet());
+ if(trace)
+ log.debug("Loaded properties, users="+bundle.keySet());
}
return bundle;
@@ -259,6 +267,8 @@
static Properties loadProperties(String propertiesName, Logger log)
throws IOException
{
+ boolean trace = log.isTraceEnabled();
+
ClassLoader loader = SecurityActions.getContextClassLoader();
URL url = null;
// First check for local visibility via a URLClassLoader.findResource
@@ -266,7 +276,8 @@
{
URLClassLoader ucl = (URLClassLoader) loader;
url = SecurityActions.findResource(ucl,propertiesName);
- log.trace("findResource: "+url);
+ if(trace)
+ log.trace("findResource: "+url);
}
if( url == null )
url = loader.getResource(propertiesName);
@@ -275,7 +286,8 @@
url = new URL(propertiesName);
}
- log.trace("Properties file=" + url );
+ if(trace)
+ log.trace("Properties file=" + url );
Properties bundle = new Properties();
if( url != null )
@@ -287,7 +299,8 @@
}
catch (PrivilegedActionException e)
{
- log.trace("open stream error:", e);
+ if(trace)
+ log.trace("open stream error:", e);
throw new IOException(e.getLocalizedMessage());
}
if (is != null)
@@ -512,4 +525,4 @@
{
return Base64Utils.fromb64(str);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/identitytrust/JBossIdentityTrustContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/identitytrust/JBossIdentityTrustContext.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/identitytrust/JBossIdentityTrustContext.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -44,6 +44,7 @@
public class JBossIdentityTrustContext extends IdentityTrustContext
{
protected Logger log = Logger.getLogger(JBossIdentityTrustContext.class);
+ protected boolean trace = log.isTraceEnabled();
public JBossIdentityTrustContext(String secDomain, SecurityContext sc)
{
@@ -85,7 +86,8 @@
catch (PrivilegedActionException e)
{
Exception exc = e.getException();
- log.trace("Error in isAuthorize:", exc);
+ if(trace)
+ log.trace("Error in isAuthorize:", exc);
invokeAbort();
throw ((IdentityTrustException)exc);
}
@@ -128,7 +130,8 @@
}
catch ( Exception e)
{
- log.debug("Error instantiating IdentityTrustModule:",e);
+ if(trace)
+ log.debug("Error instantiating IdentityTrustModule:",e);
}
if(im == null)
throw new IllegalStateException("IdentityTrustModule has not " +
@@ -189,7 +192,8 @@
//REQUISITE case
if(flag == ControlFlag.REQUISITE)
{
- log.trace("REQUISITE failed for " + module);
+ if(trace)
+ log.trace("REQUISITE failed for " + module);
if(moduleException == null)
moduleException = new IdentityTrustException("Identity Trust Validation failed");
else
@@ -198,7 +202,8 @@
//REQUIRED Case
if(flag == ControlFlag.REQUIRED)
{
- log.trace("REQUIRED failed for " + module);
+ if(trace)
+ log.trace("REQUIRED failed for " + module);
encounteredRequiredDeny = true;
}
if(flag == ControlFlag.OPTIONAL)
@@ -243,4 +248,4 @@
throw new IdentityTrustException("abort on modules failed");
}
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/jacc/ContextPolicy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/jacc/ContextPolicy.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/jacc/ContextPolicy.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -130,7 +130,8 @@
}
if( principalNames.size() > 0 )
{
- log.trace("ProtectionDomain principals="+principalNames);
+ if(trace)
+ log.trace("ProtectionDomain principals="+principalNames);
for(int n = 0; implied == false && n < principalNames.size(); n ++)
{
String name = (String) principalNames.get(n);
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/jacc/DelegatingPolicy.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/jacc/DelegatingPolicy.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/jacc/DelegatingPolicy.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -127,7 +127,8 @@
log.trace("Loaded JACC permissions: " + loadedPerms);
// Load PolicyContext as this also can trigger permission checks in implies
Class<?> c = PolicyContext.class;
- log.trace("loaded policy context class"+c);
+ if(trace)
+ log.trace("loaded policy context class"+c);
}
public Class<?>[] getExternalPermissionTypes()
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/providers/attribute/LdapAttributeMappingProvider.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/providers/attribute/LdapAttributeMappingProvider.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/mapping/providers/attribute/LdapAttributeMappingProvider.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -133,7 +133,8 @@
String bindDN = (String) options.get(BIND_DN);
if(bindDN == null || bindDN.length() == 0)
{
- log.trace("bindDN is not found");
+ if(trace)
+ log.trace("bindDN is not found");
return;
}
String bindCredential = (String) options.get(BIND_CREDENTIAL);
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/JBossPolicyRegistration.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/JBossPolicyRegistration.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/JBossPolicyRegistration.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -167,7 +167,8 @@
}
catch (Exception e)
{
- log.debug("Error in registering xacml policy:", e);
+ if(trace)
+ log.debug("Error in registering xacml policy:", e);
}
}
else if (PolicyRegistration.ACL.equalsIgnoreCase(type))
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/SubjectActions.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/SubjectActions.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/SubjectActions.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -95,7 +95,8 @@
}
catch(PolicyContextException pce)
{
- log.trace("Error obtaining subject:", pce);
+ if(log.isTraceEnabled())
+ log.trace("Error obtaining subject:", pce);
SecurityContext sc = getSecurityContext();
subject = sc.getUtil().getSubject();
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/TransactionManagerLocator.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/TransactionManagerLocator.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/TransactionManagerLocator.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -30,8 +30,6 @@
import org.jboss.logging.Logger;
-//$Id$
-
/**
* Locate a Transaction Manager
* @author Anil.Saldhana at redhat.com
@@ -41,6 +39,7 @@
public class TransactionManagerLocator
{
private static Logger log = Logger.getLogger(TransactionManagerLocator.class);
+ private boolean trace = log.isTraceEnabled();
public TransactionManagerLocator()
{
@@ -71,7 +70,8 @@
}
catch (Exception ignore)
{
- log.trace("Exception in getJBossTM:", ignore);
+ if(trace)
+ log.trace("Exception in getJBossTM:", ignore);
}
}
return tm;
@@ -84,4 +84,4 @@
Method m = clz.getMethod("locate", new Class[]{});
return (TransactionManager) m.invoke(null, new Object[0]);
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/auth/JASPIServerAuthenticationManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/auth/JASPIServerAuthenticationManager.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/auth/JASPIServerAuthenticationManager.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -81,7 +81,8 @@
}
catch(AuthException ae)
{
- log.trace("AuthException:",ae);
+ if(trace)
+ log.trace("AuthException:",ae);
}
return AuthStatus.SUCCESS == status ;
}
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/auth/JaasSecurityManagerBase.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -427,7 +427,8 @@
}
if(this.authorizationManager == null)
{
- log.trace("doesUserHaveRole:AuthorizationManager is null");
+ if(trace)
+ log.trace("doesUserHaveRole:AuthorizationManager is null");
return false;
}
return authorizationManager.doesUserHaveRole(principal, rolePrincipals);
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/authorization/JBossAuthorizationContext.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -309,7 +309,8 @@
}
catch ( Exception e)
{
- log.debug("Error instantiating AuthorizationModule:",e);
+ if(trace)
+ log.debug("Error instantiating AuthorizationModule:",e);
}
if(am == null)
throw new IllegalStateException("AuthorizationModule has not " +
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/identitytrust/JBossIdentityTrustManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/identitytrust/JBossIdentityTrustManager.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/identitytrust/JBossIdentityTrustManager.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -39,6 +39,8 @@
public class JBossIdentityTrustManager implements IdentityTrustManager
{
protected static Logger log = Logger.getLogger(JBossIdentityTrustManager.class);
+ protected boolean trace = log.isTraceEnabled();
+
private String securityDomain = null;
private IdentityTrustContext identityTrustContext = null;
@@ -73,7 +75,8 @@
}
catch (IdentityTrustException e)
{
- log.trace("Trust Exception:",e);
+ if(trace)
+ log.trace("Trust Exception:",e);
}
return td;
}
@@ -82,4 +85,4 @@
{
return this.securityDomain;
}
-}
+}
\ No newline at end of file
Modified: projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/mapping/JBossMappingManager.java
===================================================================
--- projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/mapping/JBossMappingManager.java 2009-09-09 17:36:35 UTC (rev 93321)
+++ projects/security/security-jboss-sx/trunk/jbosssx/src/main/java/org/jboss/security/plugins/mapping/JBossMappingManager.java 2009-09-09 17:44:15 UTC (rev 93322)
@@ -150,4 +150,4 @@
}
return mp;
}
-}
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list