Author: anil.saldhana(a)jboss.com Date: 2009-08-25 16:22:41 -0400 (Tue, 25 Aug 2009) New Revision: 743 Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java 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/idp/IDPWebBrowserSSOValve.java identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/provider/OpenIDProviderManager.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/soap/SOAPSAMLXACML.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/WSTrustJAXBFactory.java identity-federation/trunk/jboss-identity-seam/src/main/java/org/jboss/identity/seam/federation/SamlAuthenticationFilter.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/roles/DefaultRoleValidator.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.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/servlets/OpenIDConsumerServlet.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDProviderServlet.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDYadisServlet.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/test/java/org/jboss/test/identity/federation/web/integration/LocalProviderOpenIDUnitTestCase.java Log: JBID-176: findbugs analysis Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/CircleOfTrustServlet.java 2009-08-25 20:22:41 UTC (rev 743) @@ -54,7 +54,7 @@ { private static final long serialVersionUID = 1L; - private IMetadataConfigurationStore configProvider = new FileBasedMetadataConfigurationStore(); + private transient IMetadataConfigurationStore configProvider = new FileBasedMetadataConfigurationStore(); @Override public void init(ServletConfig config) throws ServletException 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-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/MetadataServlet.java 2009-08-25 20:22:41 UTC (rev 743) @@ -37,21 +37,20 @@ import javax.servlet.http.HttpServletResponse; import javax.xml.bind.JAXBElement; -import org.apache.catalina.LifecycleException; import org.apache.log4j.Logger; import org.jboss.identity.federation.api.saml.v2.metadata.KeyDescriptorMetaDataBuilder; import org.jboss.identity.federation.api.saml.v2.metadata.MetaDataBuilder; import org.jboss.identity.federation.api.util.KeyUtil; import org.jboss.identity.federation.bindings.providers.IMetadataProvider; +import org.jboss.identity.federation.core.config.KeyProviderType; +import org.jboss.identity.federation.core.config.KeyValueType; +import org.jboss.identity.federation.core.config.MetadataProviderType; +import org.jboss.identity.federation.core.config.ProviderType; import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLConstants; import org.jboss.identity.federation.core.util.XMLEncryptionUtil; import org.jboss.identity.federation.saml.v2.metadata.EntityDescriptorType; import org.jboss.identity.federation.saml.v2.metadata.KeyDescriptorType; import org.jboss.identity.federation.saml.v2.metadata.RoleDescriptorType; -import org.jboss.identity.federation.core.config.KeyProviderType; -import org.jboss.identity.federation.core.config.KeyValueType; -import org.jboss.identity.federation.core.config.MetadataProviderType; -import org.jboss.identity.federation.core.config.ProviderType; import org.jboss.identity.federation.web.interfaces.TrustKeyManager; import org.jboss.identity.federation.web.util.ConfigurationUtil; import org.jboss.identity.xmlsec.w3.xmldsig.KeyInfoType; @@ -68,11 +67,11 @@ private boolean trace = log.isTraceEnabled(); private String configFileLocation = "/WEB-INF/jboss-idfed.xml"; - private MetadataProviderType metadataProviderType = null; + private transient MetadataProviderType metadataProviderType = null; - private IMetadataProvider<?> metadataProvider = null; + private transient IMetadataProvider<?> metadataProvider = null; - private EntityDescriptorType metadata; + private transient EntityDescriptorType metadata; private String signingAlias = null; private String encryptingAlias = null; @@ -83,95 +82,88 @@ public void init(ServletConfig config) throws ServletException { super.init(config); - ServletContext context = config.getServletContext(); - String configL = config.getInitParameter("configFile"); - if(configL != null && configL.length() > 0) - configFileLocation = configL; - if(trace) - log.trace("Config File Location="+ configFileLocation); - InputStream is = context.getResourceAsStream(configFileLocation); - if(is == null) - throw new RuntimeException(configFileLocation + " missing"); - - //Look for signing alias - signingAlias = config.getInitParameter("signingAlias"); - encryptingAlias = config.getInitParameter("encryptingAlias"); - try { - ProviderType providerType = ConfigurationUtil.getIDPConfiguration(is); - metadataProviderType = providerType.getMetaDataProvider(); - String fqn = metadataProviderType.getClassName(); - ClassLoader tcl = SecurityActions.getContextClassLoader(); - Class<?> clazz = tcl.loadClass(fqn); - metadataProvider = (IMetadataProvider) clazz.newInstance(); - List<KeyValueType> keyValues = metadataProviderType.getOption(); - Map<String,String> options = new HashMap<String,String>(); - if(keyValues != null) - { - for(KeyValueType kvt: keyValues) - options.put(kvt.getKey(), kvt.getValue()); - } - metadataProvider.init(options); - if(metadataProvider.isMultiple()) - throw new RuntimeException("Multiple Entities not currently supported"); - - /** - * Since a metadata provider does not have access to the servlet context. - * It may be difficult to get to the resource from the TCL. - */ - String fileInjectionStr = metadataProvider.requireFileInjection(); - if(fileInjectionStr != null && fileInjectionStr.length() > 0) - { - metadataProvider.injectFileStream(context.getResourceAsStream(fileInjectionStr)); - } - - metadata = (EntityDescriptorType) metadataProvider.getMetaData(); + ServletContext context = config.getServletContext(); + String configL = config.getInitParameter("configFile"); + if(configL != null && configL.length() > 0) + configFileLocation = configL; + if(trace) + log.trace("Config File Location="+ configFileLocation); + InputStream is = context.getResourceAsStream(configFileLocation); + if(is == null) + throw new RuntimeException(configFileLocation + " missing"); - //Get the trust manager information - KeyProviderType keyProvider = providerType.getKeyProvider(); - signingAlias = keyProvider.getSigningAlias(); - try - { - String keyManagerClassName = keyProvider.getClassName(); - if(keyManagerClassName == null) - throw new RuntimeException("KeyManager class name is null"); - - clazz = tcl.loadClass(keyManagerClassName); - this.keyManager = (TrustKeyManager) clazz.newInstance(); - keyManager.setAuthProperties(keyProvider.getAuth()); - - Certificate cert = keyManager.getCertificate(signingAlias); - KeyInfoType keyInfo = KeyUtil.getKeyInfo(cert); - - //TODO: Assume just signing key for now - KeyDescriptorType keyDescriptor = KeyDescriptorMetaDataBuilder.createKeyDescriptor(keyInfo, - null, 0, true, false); - - updateKeyDescriptor(metadata, keyDescriptor); - - //encryption - if(this.encryptingAlias != null) - { - cert = keyManager.getCertificate(encryptingAlias); - keyInfo = KeyUtil.getKeyInfo(cert); - String certAlgo = cert.getPublicKey().getAlgorithm(); - keyDescriptor = KeyDescriptorMetaDataBuilder.createKeyDescriptor(keyInfo, - XMLEncryptionUtil.getEncryptionURL(certAlgo), - XMLEncryptionUtil.getEncryptionKeySize(certAlgo), false, true); - updateKeyDescriptor(metadata, keyDescriptor); - } - } - catch(Exception e) - { - log.error("Exception reading configuration:",e); - throw new LifecycleException(e.getLocalizedMessage()); - } - } - catch(Exception e) + //Look for signing alias + signingAlias = config.getInitParameter("signingAlias"); + encryptingAlias = config.getInitParameter("encryptingAlias"); + + ProviderType providerType = ConfigurationUtil.getIDPConfiguration(is); + metadataProviderType = providerType.getMetaDataProvider(); + String fqn = metadataProviderType.getClassName(); + ClassLoader tcl = SecurityActions.getContextClassLoader(); + Class<?> clazz = tcl.loadClass(fqn); + metadataProvider = (IMetadataProvider) clazz.newInstance(); + List<KeyValueType> keyValues = metadataProviderType.getOption(); + Map<String,String> options = new HashMap<String,String>(); + if(keyValues != null) + { + for(KeyValueType kvt: keyValues) + options.put(kvt.getKey(), kvt.getValue()); + } + metadataProvider.init(options); + if(metadataProvider.isMultiple()) + throw new RuntimeException("Multiple Entities not currently supported"); + + /** + * Since a metadata provider does not have access to the servlet context. + * It may be difficult to get to the resource from the TCL. + */ + String fileInjectionStr = metadataProvider.requireFileInjection(); + if(fileInjectionStr != null && fileInjectionStr.length() > 0) + { + metadataProvider.injectFileStream(context.getResourceAsStream(fileInjectionStr)); + } + + metadata = (EntityDescriptorType) metadataProvider.getMetaData(); + + //Get the trust manager information + KeyProviderType keyProvider = providerType.getKeyProvider(); + signingAlias = keyProvider.getSigningAlias(); + String keyManagerClassName = keyProvider.getClassName(); + if(keyManagerClassName == null) + throw new RuntimeException("KeyManager class name is null"); + + clazz = tcl.loadClass(keyManagerClassName); + this.keyManager = (TrustKeyManager) clazz.newInstance(); + keyManager.setAuthProperties(keyProvider.getAuth()); + + Certificate cert = keyManager.getCertificate(signingAlias); + KeyInfoType keyInfo = KeyUtil.getKeyInfo(cert); + + //TODO: Assume just signing key for now + KeyDescriptorType keyDescriptor = KeyDescriptorMetaDataBuilder.createKeyDescriptor(keyInfo, + null, 0, true, false); + + updateKeyDescriptor(metadata, keyDescriptor); + + //encryption + if(this.encryptingAlias != null) + { + cert = keyManager.getCertificate(encryptingAlias); + keyInfo = KeyUtil.getKeyInfo(cert); + String certAlgo = cert.getPublicKey().getAlgorithm(); + keyDescriptor = KeyDescriptorMetaDataBuilder.createKeyDescriptor(keyInfo, + XMLEncryptionUtil.getEncryptionURL(certAlgo), + XMLEncryptionUtil.getEncryptionKeySize(certAlgo), false, true); + updateKeyDescriptor(metadata, keyDescriptor); + } + } catch(Exception e) { - throw new RuntimeException(e); - } + log.error("Exception in starting servlet:",e); + throw new ServletException("Unable to start servlet"); + } + } 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-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/SOAPSAMLXACMLServlet.java 2009-08-25 20:22:41 UTC (rev 743) @@ -86,7 +86,7 @@ boolean debug = false; - private PolicyDecisionPoint pdp = null; + private transient PolicyDecisionPoint pdp = null; public void init(ServletConfig config) throws ServletException { 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-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-08-25 20:22:41 UTC (rev 743) @@ -537,7 +537,7 @@ } //Private Methods - protected class SessionHolder + protected static class SessionHolder { String samlRequest; String signature; Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java 2009-08-25 20:22:41 UTC (rev 743) @@ -71,9 +71,8 @@ { tokenType = new URI("http://www.tokens.org/SpecialToken"); } - catch (URISyntaxException e) - { - e.printStackTrace(); + catch (URISyntaxException ignore) + { } } Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/OpenIDManager.java 2009-08-25 20:22:41 UTC (rev 743) @@ -378,7 +378,7 @@ * Information about a provider from the * discovery process */ - public class OpenIDProviderInformation + public static class OpenIDProviderInformation { private DiscoveryInformation discovered; @@ -396,7 +396,7 @@ /** * List of OpenID providers */ - public class OpenIDProviderList + public static class OpenIDProviderList { private List<DiscoveryInformation> providers = null; Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/provider/OpenIDProviderManager.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/provider/OpenIDProviderManager.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/openid/provider/OpenIDProviderManager.java 2009-08-25 20:22:41 UTC (rev 743) @@ -115,7 +115,7 @@ return new OpenIDMessage(DirectError.createDirectError(msg)); } - public class OpenIDMessage + public static class OpenIDMessage { private Message message; Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/soap/SOAPSAMLXACML.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/soap/SOAPSAMLXACML.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/soap/SOAPSAMLXACML.java 2009-08-25 20:22:41 UTC (rev 743) @@ -137,7 +137,7 @@ return envelope; } - public class Result + public static class Result { private Fault fault = null; private DecisionType decisionType; Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/WSTrustJAXBFactory.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/WSTrustJAXBFactory.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/WSTrustJAXBFactory.java 2009-08-25 20:22:41 UTC (rev 743) @@ -277,6 +277,8 @@ node = this.findNodeByNameNS(result, "RenewTarget", WSTrustConstants.BASE_NAMESPACE); else if (requestType.equalsIgnoreCase(WSTrustConstants.CANCEL_REQUEST)) node = this.findNodeByNameNS(result, "CancelTarget", WSTrustConstants.BASE_NAMESPACE); + if(node == null) + throw new RuntimeException("Unsupported request type:" + requestType); node.appendChild(result.importNode(targetElement, true)); } } Modified: identity-federation/trunk/jboss-identity-seam/src/main/java/org/jboss/identity/seam/federation/SamlAuthenticationFilter.java =================================================================== --- identity-federation/trunk/jboss-identity-seam/src/main/java/org/jboss/identity/seam/federation/SamlAuthenticationFilter.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-seam/src/main/java/org/jboss/identity/seam/federation/SamlAuthenticationFilter.java 2009-08-25 20:22:41 UTC (rev 743) @@ -141,7 +141,7 @@ private boolean signatureRequired = true; - protected class AuthenticatedUser + protected static class AuthenticatedUser { String userName; Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/roles/DefaultRoleValidator.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/roles/DefaultRoleValidator.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/roles/DefaultRoleValidator.java 2009-08-25 20:22:41 UTC (rev 743) @@ -50,12 +50,14 @@ if(trace) log.trace("There is no ROLES config"); } - - //Get the comma separated role names - StringTokenizer st = new StringTokenizer(csv,","); - while(st != null && st.hasMoreTokens()) + else { - roleNames.add(st.nextToken()); + //Get the comma separated role names + StringTokenizer st = new StringTokenizer(csv,","); + while(st != null && st.hasMoreTokens()) + { + roleNames.add(st.nextToken()); + } } } Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPLoginServlet.java 2009-08-25 20:22:41 UTC (rev 743) @@ -45,10 +45,10 @@ public class IDPLoginServlet extends HttpServlet { private static final long serialVersionUID = 1L; - private ServletContext context; + private transient ServletContext context; private String USERNAME_FIELD = "JBID_USERNAME"; private String PASS_FIELD = "JBID_PASSWORD"; - private ILoginHandler loginHandler = null; + private transient ILoginHandler loginHandler = null; @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) @@ -158,7 +158,8 @@ RequestDispatcher dispatch = context.getRequestDispatcher("/IDPServlet"); if(dispatch == null) log("Cannot dispatch to the IDP Servlet"); - dispatch.forward(request, response); + else + dispatch.forward(request, response); return; } @@ -168,7 +169,8 @@ RequestDispatcher dispatch = context.getRequestDispatcher("/jsp/login.jsp"); if(dispatch == null) log("Cannot find the login page"); - dispatch.forward(request, response); + else + dispatch.forward(request, response); return; } } \ No newline at end of file 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-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-08-25 20:22:41 UTC (rev 743) @@ -37,6 +37,8 @@ import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; +import org.jboss.identity.federation.core.config.IDPType; +import org.jboss.identity.federation.core.config.KeyProviderType; import org.jboss.identity.federation.core.exceptions.ConfigurationException; import org.jboss.identity.federation.core.exceptions.ParsingException; import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; @@ -44,8 +46,6 @@ import org.jboss.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException; import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType; import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType; -import org.jboss.identity.federation.core.config.IDPType; -import org.jboss.identity.federation.core.config.KeyProviderType; import org.jboss.identity.federation.web.interfaces.RoleGenerator; import org.jboss.identity.federation.web.interfaces.TrustKeyConfigurationException; import org.jboss.identity.federation.web.interfaces.TrustKeyManager; @@ -70,21 +70,21 @@ public static final String PRINCIPAL_ID = "jboss_identity.principal"; public static final String ROLES_ID = "jboss_identity.roles"; - protected IDPType idpConfiguration = null; + protected transient IDPType idpConfiguration = null; - private RoleGenerator rg = new DefaultRoleGenerator(); + private transient RoleGenerator rg = new DefaultRoleGenerator(); private long assertionValidity = 5000; // 5 seconds in miliseconds private String identityURL = null; - private TrustKeyManager keyManager; + private transient TrustKeyManager keyManager; private Boolean ignoreIncomingSignatures = true; private Boolean signOutgoingMessages = true; - private ServletContext context = null; + private transient ServletContext context = null; public Boolean getIgnoreIncomingSignatures() { @@ -196,7 +196,7 @@ boolean isPost = webRequestUtil.hasSAMLRequestInPostProfile(); boolean isValid = validate(request.getRemoteAddr(), request.getQueryString(), - new SessionHolder(samlMessage, null, null), isPost); + new SessionHolder(samlMessage, null), isPost); if(!isValid) throw new GeneralSecurityException("Validation check failed"); @@ -339,17 +339,15 @@ } - protected class SessionHolder + protected static class SessionHolder { String samlRequest; - String signature; - String sigAlg; + String signature; - public SessionHolder(String req, String sig, String alg) + public SessionHolder(String req, String sig) { this.samlRequest = req; - this.signature = sig; - this.sigAlg = alg; + this.signature = sig; } } Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDConsumerServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDConsumerServlet.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDConsumerServlet.java 2009-08-25 20:22:41 UTC (rev 743) @@ -50,7 +50,7 @@ { private static final long serialVersionUID = 1L; - private ServletContext servletContext; + private transient ServletContext servletContext; private String returnURL; @Override Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDProviderServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDProviderServlet.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDProviderServlet.java 2009-08-25 20:22:41 UTC (rev 743) @@ -44,10 +44,10 @@ public class OpenIDProviderServlet extends HttpServlet { private static final long serialVersionUID = 1L; - private ServletContext servletContext = null; + private transient ServletContext servletContext = null; private String securePageName = "securepage.jsp"; - private OpenIDProviderManager serverManager = new OpenIDProviderManager(); + private transient OpenIDProviderManager serverManager = new OpenIDProviderManager(); //private ServerManager serverManager = new ServerManager(); @Override Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDYadisServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDYadisServlet.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/OpenIDYadisServlet.java 2009-08-25 20:22:41 UTC (rev 743) @@ -46,7 +46,7 @@ private boolean supportHTTP_HEAD = false; //By default, we support GET - private InputStream yadisResourceInputStream = null; + private transient InputStream yadisResourceInputStream = null; @Override public void init(ServletConfig config) throws ServletException 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-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/util/IDPWebRequestUtil.java 2009-08-25 20:22:41 UTC (rev 743) @@ -405,13 +405,7 @@ if(supportSignature) { try - { - //SigAlg - String algo = keyManager.getSigningKey().getAlgorithm(); - String sigAlg = SignatureUtil.getXMLSignatureAlgorithmURI(algo); - - sigAlg = URLEncoder.encode(sigAlg, "UTF-8"); - + { SAML2Signature ss = new SAML2Signature(); samlResponse = ss.sign(responseType, keyManager.getSigningKeyPair()); } Modified: identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/integration/LocalProviderOpenIDUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/integration/LocalProviderOpenIDUnitTestCase.java 2009-08-25 18:09:02 UTC (rev 742) +++ identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/integration/LocalProviderOpenIDUnitTestCase.java 2009-08-25 20:22:41 UTC (rev 743) @@ -79,7 +79,7 @@ } //A provider servlet that always returns true - private class ProviderServlet extends HttpServlet + private static class ProviderServlet extends HttpServlet { private static final long serialVersionUID = 1L;