[jboss-identity-commits] JBoss Identity SVN: r729 - in identity-federation/trunk: jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat and 8 other directories.

Author: anil.saldhana(a)jboss.com Date: 2009-08-24 11:21:34 -0400 (Mon, 24 Aug 2009) New Revision: 729 Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPSAMLDebugValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostSignatureFormAuthenticator.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/DocumentUtil.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/openid/HTTPProtocolAdaptor.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/PostBindingUtil.java Log: JBID-172: ensure the usage of log.isTraceEnabled Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-08-24 15:21:34 UTC (rev 729) @@ -65,6 +65,7 @@ { private static final long serialVersionUID = 1L; private static Logger log = Logger.getLogger(MetadataServlet.class); + private boolean trace = log.isTraceEnabled(); private String configFileLocation = "/WEB-INF/jboss-idfed.xml"; private MetadataProviderType metadataProviderType = null; @@ -86,7 +87,8 @@ String configL = config.getInitParameter("configFile"); if(configL != null && configL.length() > 0) configFileLocation = configL; - log.trace("Config File Location="+ configFileLocation); + if(trace) + log.trace("Config File Location="+ configFileLocation); InputStream is = context.getResourceAsStream(configFileLocation); if(is == null) throw new RuntimeException(configFileLocation + " missing"); Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-08-24 15:21:34 UTC (rev 729) @@ -75,6 +75,7 @@ public class SOAPSAMLXACMLServlet extends HttpServlet { private static Logger log = Logger.getLogger(SOAPSAMLXACMLServlet.class); + private boolean trace = log.isTraceEnabled(); private static final long serialVersionUID = 1L; @@ -111,9 +112,12 @@ debug = false; } - log.trace("Issuer=" + issuer + " :: issuerID=" + issuerId); - log.trace("PolicyConfig File:" + policyConfigFileName); - log.trace("Debug="+debug); + if(trace) + { + log.trace("Issuer=" + issuer + " :: issuerID=" + issuerId); + log.trace("PolicyConfig File:" + policyConfigFileName); + log.trace("Debug="+debug); + } if(debug) { @@ -145,7 +149,7 @@ try { Document inputDoc = DocumentUtil.getDocument(req.getInputStream()); - if(debug) + if(debug && trace) log.trace("Received SOAP:"+DocumentUtil.getDocumentAsString(inputDoc)); Unmarshaller un = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage()); Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-08-24 15:21:34 UTC (rev 729) @@ -66,6 +66,7 @@ private final Map<String,SecretKey> keys = new HashMap<String,SecretKey>(); private static Logger log = Logger.getLogger(KeyStoreKeyManager.class); + private boolean trace = log.isTraceEnabled(); private final HashMap<String,String> domainAliasMap = new HashMap<String,String>(); private final HashMap<String,String> authPropsMap = new HashMap<String,String>(); @@ -201,7 +202,8 @@ if(cert != null) publicKey = cert.getPublicKey(); else - log.debug("No public key found for alias=" + alias); + if(trace) + log.trace("No public key found for alias=" + alias); return publicKey; } Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-08-24 15:21:34 UTC (rev 729) @@ -77,6 +77,7 @@ public class IDPRedirectValve extends ValveBase implements Lifecycle { private static Logger log = Logger.getLogger(IDPRedirectValve.class); + private boolean trace = log.isTraceEnabled(); protected IDPType idpConfiguration = null; @@ -184,7 +185,8 @@ else { log.error("No SAML Request Message"); - log.trace("Referer="+referer); + if(trace) + log.trace("Referer="+referer); throw new ServletException("No SAML Request Message"); } } @@ -228,7 +230,7 @@ String urlEncodedResponse = RedirectBindingUtil.deflateBase64URLEncode(baos.toByteArray()); String destination = responseType.getDestination(); - log.trace("IDP:Destination=" + destination); + if(trace) log.trace("IDP:Destination=" + destination); if(relayState != null && relayState.length() > 0) relayState = RedirectBindingUtil.urlEncode(relayState); @@ -417,10 +419,10 @@ sp.setResponseDestinationURI(responseURL); responseType = saml2Response.createResponseType(id, sp, idp, issuerHolder); - log.debug("ResponseType = "); //Lets see how the response looks like if(log.isTraceEnabled()) { + log.trace("ResponseType = "); StringWriter sw = new StringWriter(); saml2Response.marshall(responseType, sw); log.trace("IDPRedirectValve::Response="+sw.toString()); @@ -510,8 +512,9 @@ try { idpConfiguration = ConfigurationUtil.getIDPConfiguration(is); - this.identityURL = idpConfiguration.getIdentityURL(); - log.trace("Identity Provider URL=" + this.identityURL); + this.identityURL = idpConfiguration.getIdentityURL(); + if(trace) + log.trace("Identity Provider URL=" + this.identityURL); this.assertionValidity = idpConfiguration.getAssertionValidity(); } catch (Exception e) Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-08-24 15:21:34 UTC (rev 729) @@ -71,6 +71,7 @@ public class IDPRedirectWithSignatureValve extends IDPRedirectValve { private static Logger log = Logger.getLogger(IDPRedirectWithSignatureValve.class); + private boolean trace = log.isTraceEnabled(); private boolean ignoreSignature = false; @@ -114,7 +115,7 @@ log.error("Exception reading configuration:",e); throw new LifecycleException(e.getLocalizedMessage()); } - log.trace("Key Provider=" + keyProvider.getClassName()); + if(trace) log.trace("Key Provider=" + keyProvider.getClassName()); } @Override @@ -126,7 +127,7 @@ if(this.ignoreSignature) { - log.trace("Since signature is to be ignored, validation returns"); + if(trace) log.trace("Since signature is to be ignored, validation returns"); return true; } @@ -257,11 +258,11 @@ } catch (JAXBException e) { - log.trace(e); + if(trace) log.trace(e); } catch (SAXException e) { - log.trace(e); + if(trace) log.trace(e); } log.trace("IDPRedirectValveWithSignature::Response="+sw.toString()); } Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPSAMLDebugValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPSAMLDebugValve.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPSAMLDebugValve.java 2009-08-24 15:21:34 UTC (rev 729) @@ -40,7 +40,7 @@ public class IDPSAMLDebugValve extends ValveBase { private static Logger log = Logger.getLogger(IDPSAMLDebugValve.class); - + private boolean debugEnabled = log.isDebugEnabled(); @Override public void invoke(Request request, Response response) throws IOException, ServletException @@ -51,7 +51,8 @@ builder.append("SAMLRequest=" + param).append("\n"); builder.append("Parameter exists?="+ param != null).append("\n"); String debugInfo = builder.toString(); - log.debug("SP Sent::"+ debugInfo); + if(debugEnabled) + log.debug("SP Sent::"+ debugInfo); getNext().invoke(request, response); } Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-08-24 15:21:34 UTC (rev 729) @@ -72,6 +72,7 @@ public class IDPWebBrowserSSOValve extends ValveBase implements Lifecycle { private static Logger log = Logger.getLogger(IDPWebBrowserSSOValve.class); + private boolean trace = log.isTraceEnabled(); protected IDPType idpConfiguration = null; @@ -135,7 +136,7 @@ if(containsSAMLRequestMessage) { - log.trace("Storing the SAMLRequest and RelayState in session"); + if(trace) log.trace("Storing the SAMLRequest and RelayState in session"); session.setNote("SAMLRequest", samlMessage); if(relayState != null && relayState.length() > 0) session.setNote("RelayState", relayState.trim()); @@ -158,7 +159,8 @@ { userPrincipal = request.getPrincipal(); referer = request.getHeader("Referer"); - log.debug("Referer in finally block="+ referer + ":user principal=" + userPrincipal); + if(trace) + log.trace("Referer in finally block="+ referer + ":user principal=" + userPrincipal); } } @@ -202,11 +204,13 @@ signature = (String) session.getNote("Signature"); sigAlg = (String) session.getNote("sigAlg"); - log.trace("Retrieved saml message and relay state from session"); - log.trace("saml message=" + samlMessage + "::relay state="+ relayState); - log.trace("Signature=" + signature + "::sigAlg="+ sigAlg); + if(trace) + { + log.trace("Retrieved saml message and relay state from session"); + log.trace("saml message=" + samlMessage + "::relay state="+ relayState); + log.trace("Signature=" + signature + "::sigAlg="+ sigAlg); + } - session.removeNote("SAMLRequest"); if(relayState != null && relayState.length() > 0) @@ -250,7 +254,7 @@ } catch (IssuerNotTrustedException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -259,7 +263,7 @@ } catch (ParsingException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -268,7 +272,7 @@ } catch (ConfigurationException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -277,7 +281,7 @@ } catch (IssueInstantMissingException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -286,7 +290,7 @@ } catch(GeneralSecurityException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -308,11 +312,11 @@ } catch (ParsingException e) { - log.trace(e); + if(trace) log.trace(e); } catch (GeneralSecurityException e) { - log.trace(e); + if(trace) log.trace(e); } } return; @@ -320,7 +324,7 @@ else { log.error("No SAML Request Message"); - log.trace("Referer="+referer); + if(trace) log.trace("Referer="+referer); try { @@ -328,7 +332,7 @@ } catch (ConfigurationException e) { - log.trace(e); + if(trace) log.trace(e); } } } @@ -337,7 +341,7 @@ protected void sendErrorResponseToSP(String referrer, Response response, String relayState, IDPWebRequestUtil webRequestUtil) throws ServletException, IOException, ConfigurationException { - log.trace("About to send error response to SP:" + referrer); + if(trace) log.trace("About to send error response to SP:" + referrer); Document samlResponse = webRequestUtil.getErrorResponse(referrer, JBossSAMLURIConstants.STATUS_RESPONDER.get(), @@ -478,7 +482,7 @@ { idpConfiguration = ConfigurationUtil.getIDPConfiguration(is); this.identityURL = idpConfiguration.getIdentityURL(); - log.trace("Identity Provider URL=" + this.identityURL); + if(trace) log.trace("Identity Provider URL=" + this.identityURL); this.assertionValidity = idpConfiguration.getAssertionValidity(); } catch (Exception e) @@ -509,7 +513,7 @@ log.error("Exception reading configuration:",e); throw new LifecycleException(e.getLocalizedMessage()); } - log.trace("Key Provider=" + keyProvider.getClassName()); + if(trace) log.trace("Key Provider=" + keyProvider.getClassName()); } } Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-08-24 15:21:34 UTC (rev 729) @@ -40,6 +40,7 @@ public class BaseFormAuthenticator extends FormAuthenticator { private static Logger log = Logger.getLogger(BaseFormAuthenticator.class); + private boolean trace = log.isTraceEnabled(); protected SPType spConfiguration = null; @@ -88,7 +89,7 @@ spConfiguration = ConfigurationUtil.getSPConfiguration(is); this.identityURL = spConfiguration.getIdentityURL(); this.serviceURL = spConfiguration.getServiceURL(); - log.trace("Identity Provider URL=" + this.identityURL); + if(trace) log.trace("Identity Provider URL=" + this.identityURL); } catch (Exception e) { Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-08-24 15:21:34 UTC (rev 729) @@ -68,6 +68,7 @@ public class SPPostFormAuthenticator extends BaseFormAuthenticator { private static Logger log = Logger.getLogger(SPPostFormAuthenticator.class); + private boolean trace = log.isTraceEnabled(); public SPPostFormAuthenticator() { @@ -82,7 +83,8 @@ Principal principal = request.getUserPrincipal(); if (principal != null) { - log.debug("Already authenticated '" + principal.getName() + "'"); + if(trace) + log.trace("Already authenticated '" + principal.getName() + "'"); return true; } @@ -123,7 +125,8 @@ } catch(AssertionExpiredException aie) { - log.debug("Assertion has expired. Issuing a new saml2 request to the IDP"); + if(trace) + log.trace("Assertion has expired. Issuing a new saml2 request to the IDP"); try { AuthnRequestType authnRequest = spUtil.createSAMLRequest(serviceURL, identityURL); @@ -131,13 +134,14 @@ } catch (Exception e) { - log.trace("Exception:",e); + if(trace) log.trace("Exception:",e); } return false; } catch(Exception e) { - log.debug("Exception :",e); + if(trace) + log.trace("Exception :",e); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostSignatureFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostSignatureFormAuthenticator.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostSignatureFormAuthenticator.java 2009-08-24 15:21:34 UTC (rev 729) @@ -59,6 +59,7 @@ public class SPPostSignatureFormAuthenticator extends SPPostFormAuthenticator { private static Logger log = Logger.getLogger(SPPostSignatureFormAuthenticator.class); + private boolean trace = log.isTraceEnabled(); private TrustKeyManager keyManager; @@ -98,7 +99,7 @@ log.error("Exception reading configuration:",e); throw new LifecycleException(e.getLocalizedMessage()); } - log.trace("Key Provider=" + keyProvider.getClassName()); + if(trace) log.trace("Key Provider=" + keyProvider.getClassName()); } protected void sendRequestToIDP(AuthnRequestType authnRequest, String relayState, Response response) @@ -139,9 +140,9 @@ try { PublicKey publicKey = keyManager.getValidatingKey(issuerURL.getHost()); - log.trace("Going to verify signature in the saml response from IDP"); + if(trace) log.trace("Going to verify signature in the saml response from IDP"); boolean sigResult = XMLSignatureUtil.validate(samlResponse, publicKey); - log.trace("Signature verification="+sigResult); + if(trace) log.trace("Signature verification="+sigResult); return sigResult; } catch (TrustKeyConfigurationException e) Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-08-24 15:21:34 UTC (rev 729) @@ -69,6 +69,7 @@ public class SPRedirectFormAuthenticator extends BaseFormAuthenticator { private static Logger log = Logger.getLogger(SPRedirectFormAuthenticator.class); + private boolean trace = log.isTraceEnabled(); public SPRedirectFormAuthenticator() { @@ -81,7 +82,8 @@ Principal principal = request.getUserPrincipal(); if (principal != null) { - log.debug("Already authenticated '" + principal.getName() + "'"); + if(trace) + log.trace("Already authenticated '" + principal.getName() + "'"); return true; } @@ -123,7 +125,8 @@ } catch(AssertionExpiredException aie) { - log.debug("Assertion has expired. Issuing a new saml2 request to the IDP"); + if(trace) + log.trace("Assertion has expired. Issuing a new saml2 request to the IDP"); try { String destination = createSAMLRequestMessage( relayState, response); @@ -131,13 +134,14 @@ } catch (Exception e) { - log.trace("Exception:",e); + if(trace) log.trace("Exception:",e); } return false; } catch(Exception e) { - log.debug("Exception :",e); + if(trace) + log.trace("Exception :",e); } //fallback @@ -161,7 +165,8 @@ String base64Request = RedirectBindingUtil.deflateBase64URLEncode(baos.toByteArray()); String destination = authnRequest.getDestination() + getDestination(base64Request, relayState); - log.debug("Sending to destination="+destination); + if(trace) + log.trace("Sending to destination="+destination); return destination; } @@ -184,7 +189,8 @@ if(spTrust != null) { String domainsTrusted = spTrust.getDomains(); - log.trace("Domains that SP trusts="+domainsTrusted + " and issuer domain="+issuerDomain); + if(trace) + log.trace("Domains that SP trusts="+domainsTrusted + " and issuer domain="+issuerDomain); if(domainsTrusted.indexOf(issuerDomain) < 0) { //Let us do string parts checking @@ -192,10 +198,10 @@ while(st != null && st.hasMoreTokens()) { String uriBit = st.nextToken(); - log.trace("Matching uri bit="+ uriBit); + if(trace) log.trace("Matching uri bit="+ uriBit); if(issuerDomain.indexOf(uriBit) > 0) { - log.trace("Matched " + uriBit + " trust for " + issuerDomain ); + if(trace) log.trace("Matched " + uriBit + " trust for " + issuerDomain ); return; } } Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-08-24 15:21:34 UTC (rev 729) @@ -58,6 +58,7 @@ public class SPRedirectSignatureFormAuthenticator extends SPRedirectFormAuthenticator { private static Logger log = Logger.getLogger(SPRedirectSignatureFormAuthenticator.class); + private boolean trace = log.isTraceEnabled(); private TrustKeyManager keyManager; @@ -92,7 +93,7 @@ log.error("Exception reading configuration:",e); throw new LifecycleException(e.getLocalizedMessage()); } - log.trace("Key Provider=" + keyProvider.getClassName()); + if(trace) log.trace("Key Provider=" + keyProvider.getClassName()); } protected boolean validate(Request request) throws IOException, GeneralSecurityException Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java 2009-08-24 15:21:34 UTC (rev 729) @@ -49,6 +49,7 @@ public class FileBasedMetadataConfigurationStore implements IMetadataConfigurationStore { private static Logger log = Logger.getLogger(FileBasedMetadataConfigurationStore.class); + private boolean trace = log.isTraceEnabled(); private static String EXTENSION = ".xml"; @@ -65,7 +66,8 @@ File jbid = new File(userHome + "/jbid-store"); if(jbid.exists() == false) { - log.debug(jbid.getPath() + " does not exist. Hence creating."); + if(trace) + log.trace(jbid.getPath() + " does not exist. Hence creating."); jbid.mkdir(); } } @@ -118,7 +120,7 @@ ioe.initCause(e); throw ioe; } - log.trace("Persisted into " + persistedFile.getPath()); + if(trace) log.trace("Persisted into " + persistedFile.getPath()); } /** @@ -157,7 +159,7 @@ ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(trustedFile)); oos.writeObject(trusted); oos.close(); - log.trace("Persisted trusted map into "+ trustedFile.getPath()); + if(trace) log.trace("Persisted trusted map into "+ trustedFile.getPath()); } /** Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java 2009-08-24 15:21:34 UTC (rev 729) @@ -41,6 +41,7 @@ public class AssertionUtil { private static Logger log = Logger.getLogger(AssertionUtil.class); + private static boolean trace = log.isTraceEnabled(); /** * Create an assertion @@ -93,7 +94,7 @@ XMLGregorianCalendar now = XMLTimeUtil.getIssueInstant(); XMLGregorianCalendar notBefore = conditionsType.getNotBefore(); XMLGregorianCalendar notOnOrAfter = conditionsType.getNotOnOrAfter(); - log.trace("Now="+now.toXMLFormat() + " ::notBefore="+notBefore.toXMLFormat() + if(trace) log.trace("Now="+now.toXMLFormat() + " ::notBefore="+notBefore.toXMLFormat() + "::notOnOrAfter="+notOnOrAfter); return !XMLTimeUtil.isValid(now, notBefore, notOnOrAfter); } Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/DocumentUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/DocumentUtil.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/DocumentUtil.java 2009-08-24 15:21:34 UTC (rev 729) @@ -61,6 +61,7 @@ public class DocumentUtil { private static Logger log = Logger.getLogger(DocumentUtil.class); + private static boolean trace = log.isTraceEnabled(); /** @@ -305,7 +306,8 @@ { // Get child node Node childNode = list.item(i); - log.trace("Node="+ childNode.getNamespaceURI()+ "::"+childNode.getLocalName()); + if(trace) + log.trace("Node="+ childNode.getNamespaceURI()+ "::"+childNode.getLocalName()); // Visit child node visit(childNode, level+1); } Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/util/JAXBUtil.java 2009-08-24 15:21:34 UTC (rev 729) @@ -44,6 +44,7 @@ public class JAXBUtil { private static Logger log = Logger.getLogger(JAXBUtil.class); + private static boolean trace = log.isTraceEnabled(); public static final String W3C_XML_SCHEMA_NS_URI = "http://www.w3.org/2001/XMLSchema"; @@ -148,7 +149,7 @@ builder.append(" System ID=").append(exception.getSystemId()); builder.append(" exc=").append(exception.getLocalizedMessage()); - log.trace("SAX Error:" + builder.toString()); + if(trace) log.trace("SAX Error:" + builder.toString()); } public void fatalError(SAXParseException exception) throws SAXException @@ -172,7 +173,7 @@ builder.append(" System ID=").append(exception.getSystemId()); builder.append(" exc=").append(exception.getLocalizedMessage()); - log.trace("SAX Warn:" + builder.toString()); + if(trace) log.trace("SAX Warn:" + builder.toString()); } }); Schema schema = scFact.newSchema(schemaURL); Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/openid/HTTPProtocolAdaptor.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/openid/HTTPProtocolAdaptor.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/openid/HTTPProtocolAdaptor.java 2009-08-24 15:21:34 UTC (rev 729) @@ -48,6 +48,7 @@ public class HTTPProtocolAdaptor implements OpenIDProtocolAdapter, OpenIDLifecycle { private static Logger log = Logger.getLogger(HTTPProtocolAdaptor.class); + private boolean trace = log.isTraceEnabled(); private HttpServletRequest request; private HttpServletResponse response; @@ -162,7 +163,8 @@ public void sendToProvider(int version, String destinationURL, Map<String, String> paramMap) throws OpenIDProtocolException { - log.trace("send to provider=" + version + "::destinationURL=" + destinationURL); + if(trace) + log.trace("send to provider=" + version + "::destinationURL=" + destinationURL); if(version == 1) { Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-08-24 15:21:34 UTC (rev 729) @@ -65,6 +65,7 @@ { private static final long serialVersionUID = 1L; private static Logger log = Logger.getLogger(IDPServlet.class); + private boolean trace = log.isTraceEnabled(); public static final String PRINCIPAL_ID = "jboss_identity.principal"; public static final String ROLES_ID = "jboss_identity.roles"; @@ -133,7 +134,8 @@ log.error("Exception reading configuration:",e); throw new RuntimeException(e.getLocalizedMessage()); } - log.trace("Key Provider=" + keyProvider.getClassName()); + if(trace) + log.trace("Key Provider=" + keyProvider.getClassName()); } //handle the role generator @@ -160,7 +162,8 @@ if(userPrincipal == null) { //The sys admin has not set up the login servlet filters for the IDP - log.trace("Login Filters have not been configured"); + if(trace) + log.trace("Login Filters have not been configured"); response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } @@ -170,9 +173,11 @@ if(userPrincipal != null) { - log.trace("Retrieved saml message and relay state from session"); - log.trace("saml message=" + samlMessage + "::relay state="+ relayState); - + if(trace) + { + log.trace("Retrieved saml message and relay state from session"); + log.trace("saml message=" + samlMessage + "::relay state="+ relayState); + } session.removeAttribute("SAMLRequest"); if(relayState != null && relayState.length() > 0) @@ -207,7 +212,8 @@ } - log.trace("Roles have been determined:Creating response"); + if(trace) + log.trace("Roles have been determined:Creating response"); AuthnRequestType art = (AuthnRequestType) requestAbstractType; destination = art.getAssertionConsumerServiceURL(); @@ -219,7 +225,7 @@ } catch (IssuerNotTrustedException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -228,7 +234,7 @@ } catch (ParsingException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -237,7 +243,7 @@ } catch (ConfigurationException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -246,7 +252,7 @@ } catch (IssueInstantMissingException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -255,7 +261,7 @@ } catch(GeneralSecurityException e) { - log.trace(e); + if(trace) log.trace(e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -274,11 +280,11 @@ } catch (ParsingException e) { - log.trace(e); + if(trace) log.trace(e); } catch (GeneralSecurityException e) { - log.trace(e); + if(trace) log.trace(e); } } return; @@ -286,7 +292,7 @@ else { log.error("No SAML Request Message"); - log.trace("Referer="+referer); + if(trace) log.trace("Referer="+referer); try { @@ -294,7 +300,7 @@ } catch (ConfigurationException e) { - log.trace(e); + if(trace) log.trace(e); } } } @@ -303,7 +309,7 @@ protected void sendErrorResponseToSP(String referrer, HttpServletResponse response, String relayState, IDPWebRequestUtil webRequestUtil) throws ServletException, IOException, ConfigurationException { - log.trace("About to send error response to SP:" + referrer); + if(trace) log.trace("About to send error response to SP:" + referrer); Document samlResponse = webRequestUtil.getErrorResponse(referrer, JBossSAMLURIConstants.STATUS_RESPONDER.get(), Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-08-24 15:21:34 UTC (rev 729) @@ -78,6 +78,7 @@ public class IDPWebRequestUtil { private static Logger log = Logger.getLogger(IDPWebRequestUtil.class); + private boolean trace = log.isTraceEnabled(); private boolean redirectProfile = false; private boolean postProfile = false; @@ -115,7 +116,7 @@ else { byte[] samlBytes = PostBindingUtil.base64Decode(samlMessage); - log.trace("SAMLRequest=" + new String(samlBytes)); + if(trace) log.trace("SAMLRequest=" + new String(samlBytes)); is = new ByteArrayInputStream(samlBytes); } return saml2Request.getRequestType(is); @@ -132,7 +133,8 @@ { Document samlResponseDocument = null; - log.trace("AssertionConsumerURL=" + assertionConsumerURL + + if(trace) + log.trace("AssertionConsumerURL=" + assertionConsumerURL + "::assertion validity=" + assertionValidity); ResponseType responseType = null; @@ -181,7 +183,8 @@ log.trace("Response="+sw.toString()); } - log.trace("Support Sig=" + supportSignature + " ::Post Profile?=" + hasSAMLRequestInPostProfile()); + if(trace) + log.trace("Support Sig=" + supportSignature + " ::Post Profile?=" + hasSAMLRequestInPostProfile()); if(supportSignature && hasSAMLRequestInPostProfile()) { try @@ -191,7 +194,7 @@ } catch (Exception e) { - log.trace(e); + if(trace) log.trace(e); } } else @@ -225,7 +228,8 @@ if(idpTrust != null) { String domainsTrusted = idpTrust.getDomains(); - log.trace("Domains that IDP trusts="+domainsTrusted + " and issuer domain="+issuerDomain); + if(trace) + log.trace("Domains that IDP trusts="+domainsTrusted + " and issuer domain="+issuerDomain); if(domainsTrusted.indexOf(issuerDomain) < 0) { //Let us do string parts checking @@ -233,10 +237,12 @@ while(st != null && st.hasMoreTokens()) { String uriBit = st.nextToken(); - log.trace("Matching uri bit="+ uriBit); + if(trace) + log.trace("Matching uri bit="+ uriBit); if(issuerDomain.indexOf(uriBit) > 0) { - log.trace("Matched " + uriBit + " trust for " + issuerDomain ); + if(trace) + log.trace("Matched " + uriBit + " trust for " + issuerDomain ); return; } } @@ -274,25 +280,25 @@ } catch (TransformerFactoryConfigurationError e) { - log.trace(e); + if(trace) log.trace(e); } catch (TransformerException e) { - log.trace(e); + if(trace) log.trace(e); } if(redirectProfile) { String urlEncodedResponse = RedirectBindingUtil.deflateBase64URLEncode(responseBytes); - log.trace("IDP:Destination=" + destination); + if(trace) log.trace("IDP:Destination=" + destination); if(relayState != null && relayState.length() > 0) relayState = RedirectBindingUtil.urlEncode(relayState); String finalDest = destination + getDestination(urlEncodedResponse, relayState, supportSignature); - log.trace("Redirecting to="+ finalDest); + if(trace) log.trace("Redirecting to="+ finalDest); HTTPRedirectUtil.sendRedirectForResponder(finalDest, response); } else @@ -325,7 +331,7 @@ } catch (Exception e) { - log.trace(e); + if(trace) log.trace(e); } } else @@ -372,14 +378,14 @@ } catch (ConfigurationException e1) { - log.trace(e1); + if(trace) log.trace(e1); responseType = saml2Response.createResponseType(); } - log.debug("Error_ResponseType = "); //Lets see how the response looks like if(log.isTraceEnabled()) { + log.trace("Error_ResponseType = "); StringWriter sw = new StringWriter(); try { @@ -411,7 +417,7 @@ } catch (Exception e) { - log.trace(e); + if(trace) log.trace(e); } } else @@ -421,7 +427,7 @@ } catch (Exception e) { - log.trace(e); + if(trace) log.trace(e); } return samlResponse; Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/PostBindingUtil.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/PostBindingUtil.java 2009-08-21 21:56:07 UTC (rev 728) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/PostBindingUtil.java 2009-08-24 15:21:34 UTC (rev 729) @@ -38,6 +38,7 @@ public class PostBindingUtil { private static Logger log = Logger.getLogger(PostBindingUtil.class); + private static boolean trace = log.isTraceEnabled(); public static String base64Encode(String stringToEncode) throws IOException { @@ -94,7 +95,8 @@ builder.append("</FORM></BODY></HTML>"); String str = builder.toString(); - log.debug(str); + if(trace) + log.trace(str); out.println(str); out.close(); }