jboss-identity-commits
January 2009
jboss-identity-commits@lists.jboss.org
- 1 participants
- 85 discussions
JBoss Identity SVN: r249 - in identity-federation/trunk/identity-bindings: src/main/java/org/jboss/identity/federation/bindings/tomcat/idp and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-01-26 01:23:15 -0500 (Mon, 26 Jan 2009)
New Revision: 249
Modified:
identity-federation/trunk/identity-bindings/.classpath
identity-federation/trunk/identity-bindings/pom.xml
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
Log:
use updated tomcat to get to the GenericPrincipal from catalina request
Modified: identity-federation/trunk/identity-bindings/.classpath
===================================================================
--- identity-federation/trunk/identity-bindings/.classpath 2009-01-26 04:20:00 UTC (rev 248)
+++ identity-federation/trunk/identity-bindings/.classpath 2009-01-26 06:23:15 UTC (rev 249)
@@ -5,12 +5,12 @@
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-tomcat/catalina/5.5.12/catalina-5.5.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-util/5.5.12/tomcat-util-5.5.12.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-modeler/commons-modeler/1.1patch/commons-modeler-1.1patch.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-coyote/5.5.12/tomcat-coyote-5.5.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/coyote/6.0.18/coyote-6.0.18.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-http/5.5.12/tomcat-http-5.5.12.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-tomcat/naming-resources/5.5.12/naming-resources-5.5.12.jar"/>
Modified: identity-federation/trunk/identity-bindings/pom.xml
===================================================================
--- identity-federation/trunk/identity-bindings/pom.xml 2009-01-26 04:20:00 UTC (rev 248)
+++ identity-federation/trunk/identity-bindings/pom.xml 2009-01-26 06:23:15 UTC (rev 249)
@@ -59,14 +59,14 @@
<version>2.4</version>
</dependency>
<dependency>
- <groupId>apache-tomcat</groupId>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>5.5.12</version>
+ <version>6.0.18</version>
</dependency>
<dependency>
- <groupId>apache-tomcat</groupId>
- <artifactId>tomcat-coyote</artifactId>
- <version>5.5.12</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>6.0.18</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-26 04:20:00 UTC (rev 248)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-26 06:23:15 UTC (rev 249)
@@ -87,7 +87,7 @@
boolean containsSAMLRequestMessage = this.hasSAMLRequestMessage(request);
//Lets check if the user has been authenticated
- Principal userPrincipal = request.getUserPrincipal();
+ Principal userPrincipal = request.getPrincipal();
if(userPrincipal == null)
{
//Send it for user authentication
@@ -108,7 +108,7 @@
}
//User is authenticated as we are on the return path
- userPrincipal = request.getUserPrincipal();
+ userPrincipal = request.getPrincipal();
if(userPrincipal != null)
{
//Send valid saml response after processing the request
15 years, 3 months
- 1
- 0
JBoss Identity SVN: r248 - identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-01-25 23:20:00 -0500 (Sun, 25 Jan 2009)
New Revision: 248
Added:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/SecurityActions.java
Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java
Log:
handle keystore config/system props
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-01-23 05:37:06 UTC (rev 247)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-01-26 04:20:00 UTC (rev 248)
@@ -21,7 +21,9 @@
*/
package org.jboss.identity.federation.bindings.tomcat;
+import java.io.IOException;
import java.io.InputStream;
+import java.security.GeneralSecurityException;
import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.PublicKey;
@@ -63,6 +65,9 @@
public PrivateKey getSigningKey() throws Exception
{
if(ks == null)
+ this.setUpKeyStore();
+
+ if(ks == null)
throw new IllegalStateException("KeyStore is null");
return (PrivateKey) ks.getKey(this.signingAlias, this.signingKeyPass);
}
@@ -73,6 +78,9 @@
public PublicKey getValidatingKey(String domain) throws Exception
{
if(ks == null)
+ this.setUpKeyStore();
+
+ if(ks == null)
throw new IllegalStateException("KeyStore is null");
String domainAlias = this.domainAliasMap.get(domain);
if(domainAlias == null)
@@ -110,9 +118,6 @@
if(keypass == null || keypass.length() == 0)
throw new RuntimeException("Signing Key Pass is null");
this.signingKeyPass = keypass.toCharArray();
-
- InputStream is = ValveUtil.getKeyStoreInputStream(this.keyStoreURL);
- ks = KeyStoreUtil.getKeyStore(is, keyStorePass.toCharArray());
}
/**
@@ -125,4 +130,20 @@
domainAliasMap.put(alias.getKey(), alias.getValue());
}
}
+
+ private void setUpKeyStore() throws GeneralSecurityException, IOException
+ {
+ //Keystore URL/Pass can be either by configuration or on the HTTPS connector
+ if(this.keyStoreURL == null)
+ {
+ this.keyStoreURL = SecurityActions.getProperty("javax.net.ssl.keyStore", null);
+ }
+ if(this.keyStorePass == null)
+ {
+ this.keyStorePass = SecurityActions.getProperty("javax.net.ssl.keyStorePassword", null);
+ }
+
+ InputStream is = ValveUtil.getKeyStoreInputStream(this.keyStoreURL);
+ ks = KeyStoreUtil.getKeyStore(is, keyStorePass.toCharArray());
+ }
}
\ No newline at end of file
Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/SecurityActions.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/SecurityActions.java (rev 0)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/SecurityActions.java 2009-01-26 04:20:00 UTC (rev 248)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.bindings.tomcat;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Privileged Blocks
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Dec 9, 2008
+ */
+class SecurityActions
+{
+ /**
+ * Get the Thread Context ClassLoader
+ * @return
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+ /**
+ * Get a system property
+ * @param key the key for the property
+ * @param defaultValue A default value to return if the property is not set (Can be null)
+ * @return
+ */
+ static String getProperty(final String key, final String defaultValue)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<String>()
+ {
+ public String run()
+ {
+ return System.getProperty(key,defaultValue);
+ }
+ });
+ }
+}
\ No newline at end of file
15 years, 3 months
- 1
- 0
JBoss Identity SVN: r247 - in identity-federation/trunk: identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/subject and 2 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-01-23 00:37:06 -0500 (Fri, 23 Jan 2009)
New Revision: 247
Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyManager.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/subject/JBossIdentityGroup.java
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/DeflateUtil.java
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLSignatureUtil.java
Log:
javadoc
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyManager.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyManager.java 2009-01-23 04:45:10 UTC (rev 246)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyManager.java 2009-01-23 05:37:06 UTC (rev 247)
@@ -29,13 +29,41 @@
import org.jboss.identity.federation.bindings.config.KeyValue;
/**
+ * Key Manager interface used in trust decisions
* @author Anil.Saldhana(a)redhat.com
* @since Jan 22, 2009
*/
public interface TrustKeyManager
{
+ /**
+ * Provide a set of properties used for authentication
+ * into the storage of keys - keystore, ldap, db, HSM etc
+ * @param authList
+ * @throws Exception
+ */
void setAuthProperties(List<AuthProperty> authList) throws Exception;
+
+ /**
+ * Set a list of (domain,alias) tuple to trust domains
+ * The alias is a string that represents the validating key stored
+ * for a domain
+ * @param aliases
+ * @throws Exception
+ */
void setValidatingAlias(List<KeyValue> aliases) throws Exception;
+
+ /**
+ * Get the Signing Key
+ * @return
+ * @throws Exception
+ */
PrivateKey getSigningKey() throws Exception;
+
+ /**
+ * Get the Validating Public Key of the domain
+ * @param domain
+ * @return
+ * @throws Exception
+ */
PublicKey getValidatingKey(String domain) throws Exception;
}
\ No newline at end of file
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/subject/JBossIdentityGroup.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/subject/JBossIdentityGroup.java 2009-01-23 04:45:10 UTC (rev 246)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/subject/JBossIdentityGroup.java 2009-01-23 05:37:06 UTC (rev 247)
@@ -29,6 +29,7 @@
import java.util.Set;
/**
+ * A Principal Group used to register roles in JBoss
* @author Anil.Saldhana(a)redhat.com
* @since Jan 16, 2009
*/
Modified: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java
===================================================================
--- identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java 2009-01-23 04:45:10 UTC (rev 246)
+++ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java 2009-01-23 05:37:06 UTC (rev 247)
@@ -79,6 +79,13 @@
}
+ /**
+ * Get a Request Type from Input Stream
+ * @param is
+ * @return
+ * @throws Exception
+ * @throws IllegalArgumentException inputstream is null
+ */
@SuppressWarnings("unchecked")
public RequestAbstractType getRequestType(InputStream is) throws Exception
{
Modified: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/DeflateUtil.java
===================================================================
--- identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/DeflateUtil.java 2009-01-23 04:45:10 UTC (rev 246)
+++ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/DeflateUtil.java 2009-01-23 05:37:06 UTC (rev 247)
@@ -31,8 +31,7 @@
import java.util.zip.InflaterInputStream;
/**
- * Encoder of saml messages based on the DEFLATE
- * compression
+ * Encoder of saml messages based on DEFLATE compression
* @author Anil.Saldhana(a)redhat.com
* @since Dec 11, 2008
*/
Modified: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLSignatureUtil.java
===================================================================
--- identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLSignatureUtil.java 2009-01-23 04:45:10 UTC (rev 246)
+++ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLSignatureUtil.java 2009-01-23 05:37:06 UTC (rev 247)
@@ -55,6 +55,7 @@
import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory;
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
import org.jboss.identity.xmlsec.w3.xmldsig.ObjectFactory;
import org.jboss.identity.xmlsec.w3.xmldsig.SignatureType;
import org.w3c.dom.Document;
@@ -149,7 +150,7 @@
}
/**
- * Sign an AuthnRequestType
+ * Sign an RequestType
* @param request
* @param keypair Key Pair
* @param digestMethod (Example: DigestMethod.SHA1)
@@ -157,7 +158,7 @@
* @return
* @throws Exception
*/
- public static Document sign(AuthnRequestType request, KeyPair keypair,
+ public static Document sign(RequestAbstractType request, KeyPair keypair,
String digestMethod, String signatureMethod) throws Exception
{
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
15 years, 3 months
- 1
- 0
JBoss Identity SVN: r246 - in identity-federation/trunk: identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util and 4 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-01-22 23:45:10 -0500 (Thu, 22 Jan 2009)
New Revision: 246
Added:
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/JAXBElementMappingUtil.java
Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/RedirectBindingUtilTestCase.java
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java
identity-federation/trunk/identity-fed-core/.classpath
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java
Log:
use RequestAbstractType
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-22 21:23:24 UTC (rev 245)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-23 04:45:10 UTC (rev 246)
@@ -56,6 +56,7 @@
import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
import org.jboss.identity.federation.saml.v2.assertion.AttributeStatementType;
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
/**
@@ -83,8 +84,8 @@
@Override
public void invoke(Request request, Response response) throws IOException, ServletException
{
- boolean containsSAMLRequestMessage = this.hasSAMLRequestMessage(request);
-
+ boolean containsSAMLRequestMessage = this.hasSAMLRequestMessage(request);
+
//Lets check if the user has been authenticated
Principal userPrincipal = request.getUserPrincipal();
if(userPrincipal == null)
@@ -96,10 +97,15 @@
getNext().invoke(request, response);
}
finally
- {
- //TODO: send saml error
+ {
+ String referer = request.getHeader("Referer");
+
if(response.getStatus() == HttpServletResponse.SC_FORBIDDEN)
- throw new RuntimeException("Unauthorized User");
+ {
+ ResponseType errorResponseType = this.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get());
+ send(errorResponseType, request.getParameter("RelayState"), response);
+ return;
+ }
//User is authenticated as we are on the return path
userPrincipal = request.getUserPrincipal();
@@ -108,43 +114,61 @@
//Send valid saml response after processing the request
if(containsSAMLRequestMessage)
{
+ RequestAbstractType requestAbstractType = null;
try
{
+ requestAbstractType = getSAMLRequest(request);
this.validate(request);
- SAML2Response saml2Response = new SAML2Response();
ResponseType responseType = this.getResponse(request, userPrincipal);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- saml2Response.marshall(responseType, baos);
-
- String urlEncodedResponse = RedirectBindingUtil.deflateBase64URLEncode(baos.toByteArray());
-
- String destination = responseType.getDestination();
- log.trace("IDP:Destination=" + destination);
-
- String relayState = request.getParameter("RelayState");
- if(relayState != null && relayState.length() > 0)
- relayState = RedirectBindingUtil.urlEncode(relayState);
-
- String finalDest = destination + this.getDestination(urlEncodedResponse, relayState);
- HTTPRedirectUtil.sendRedirectForResponder(finalDest, response);
+ send(responseType, request.getParameter("RelayState"), response);
}
catch (Exception e)
{
- log.error("Exception:" ,e);
- e.printStackTrace();
- throw new ServletException(e.getLocalizedMessage());
+ log.error("Exception:" ,e);
+ if(requestAbstractType != null)
+ referer = requestAbstractType.getIssuer().getValue();
+ ResponseType errorResponseType = this.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_RESPONDER.get());
+ send(errorResponseType, request.getParameter("RelayState"), response);
}
}
else
{
- throw new ServletException("No SAML Request Message");
+ log.error("No SAML Request Message");
+ log.trace("Referer="+referer);
+ throw new ServletException("No SAML Request Message");
}
}
}
}
}
+ protected void send(ResponseType responseType, String relayState, Response response) throws ServletException
+ {
+ try
+ {
+ SAML2Response saml2Response = new SAML2Response();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ saml2Response.marshall(responseType, baos);
+
+ String urlEncodedResponse = RedirectBindingUtil.deflateBase64URLEncode(baos.toByteArray());
+
+ String destination = responseType.getDestination();
+ log.trace("IDP:Destination=" + destination);
+
+ if(relayState != null && relayState.length() > 0)
+ relayState = RedirectBindingUtil.urlEncode(relayState);
+
+ String finalDest = destination + this.getDestination(urlEncodedResponse, relayState);
+ HTTPRedirectUtil.sendRedirectForResponder(finalDest, response);
+ }
+ catch(Exception e)
+ {
+ log.error("Exception in send::",e);
+ throw new ServletException(e.getLocalizedMessage());
+ }
+ }
+
protected String getDestination(String urlEncodedResponse, String urlEncodedRelayState)
{
StringBuilder sb = new StringBuilder();
@@ -163,7 +187,17 @@
{
return request.getParameter("SAMLRequest") != null;
}
+
+ private RequestAbstractType getSAMLRequest(Request request) throws Exception
+ {
+ String samlMessage = getSAMLMessage(request);
+ InputStream is = RedirectBindingUtil.base64DeflateDecode(samlMessage);
+ SAML2Request saml2Request = new SAML2Request();
+ return saml2Request.getRequestType(is);
+ }
+
+
private ResponseType getResponse(Request request, Principal userPrincipal) throws Exception
{
ResponseType responseType = null;
@@ -219,6 +253,46 @@
return responseType;
}
+ private ResponseType getErrorResponse(String responseURL, String status) throws ServletException
+ {
+ try
+ {
+ ResponseType responseType = null;
+
+ SAML2Response saml2Response = new SAML2Response();
+
+ //Create a response type
+ String id = IDGenerator.create("ID_");
+
+ IssuerInfoHolder issuerHolder = new IssuerInfoHolder(this.identityURL);
+ issuerHolder.setStatusCode(status);
+
+ IDPInfoHolder idp = new IDPInfoHolder();
+ idp.setNameIDFormatValue(null);
+ idp.setNameIDFormat(JBossSAMLURIConstants.NAMEID_FORMAT_PERSISTENT.get());
+
+ SPInfoHolder sp = new SPInfoHolder();
+ sp.setResponseDestinationURI(responseURL);
+ responseType = saml2Response.createResponseType(id, sp, idp, issuerHolder);
+
+ log.debug("ResponseType = ");
+ //Lets see how the response looks like
+ if(log.isTraceEnabled())
+ {
+ StringWriter sw = new StringWriter();
+ saml2Response.marshall(responseType, sw);
+ log.trace("IDPRedirectValve::Response="+sw.toString());
+ }
+
+ return responseType;
+ }
+ catch(Exception e)
+ {
+ log.error("Exception in getErrorResponse::",e);
+ throw new ServletException(e.getLocalizedMessage());
+ }
+ }
+
private String getSAMLMessage(Request request)
{
return request.getParameter("SAMLRequest");
Modified: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/RedirectBindingUtilTestCase.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/RedirectBindingUtilTestCase.java 2009-01-22 21:23:24 UTC (rev 245)
+++ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/RedirectBindingUtilTestCase.java 2009-01-23 04:45:10 UTC (rev 246)
@@ -30,6 +30,7 @@
import org.jboss.identity.federation.bindings.util.RedirectBindingUtil;
import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLAuthnRequestFactory;
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
import junit.framework.TestCase;
@@ -57,8 +58,9 @@
InputStream is = RedirectBindingUtil.urlBase64DeflateDecode(request);
- AuthnRequestType parsed = saml2Request.getAuthnRequestType(is);
+ RequestAbstractType parsed = saml2Request.getRequestType(is);
assertNotNull("Parsed request is not null", parsed);
+ assertTrue("AuthnRequestType", parsed instanceof AuthnRequestType);
}
/**
Modified: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java
===================================================================
--- identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java 2009-01-22 21:23:24 UTC (rev 245)
+++ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java 2009-01-23 04:45:10 UTC (rev 246)
@@ -29,8 +29,9 @@
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-
+
import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLAuthnRequestFactory;
+import org.jboss.identity.federation.core.saml.v2.util.JAXBElementMappingUtil;
import org.jboss.identity.federation.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType;
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
@@ -75,6 +76,17 @@
ClassLoader tcl = SecurityActions.getContextClassLoader();
InputStream is = tcl.getResourceAsStream(fileName);
return getAuthnRequestType(is);
+ }
+
+
+ @SuppressWarnings("unchecked")
+ public RequestAbstractType getRequestType(InputStream is) throws Exception
+ {
+ if(is == null)
+ throw new IllegalStateException("InputStream is null");
+ Unmarshaller un = JBossSAMLAuthnRequestFactory.getValidatingUnmarshaller();
+ JAXBElement<RequestAbstractType> jaxbAuthnRequestType = (JAXBElement<RequestAbstractType>) un.unmarshal(is);
+ return jaxbAuthnRequestType.getValue();
}
/**
@@ -142,11 +154,11 @@
* @param os
* @throws Exception
*/
- public void marshall(AuthnRequestType requestType, OutputStream os) throws Exception
+ public void marshall(RequestAbstractType requestType, OutputStream os) throws Exception
{
Marshaller marshaller = JBossSAMLAuthnRequestFactory.getValidatingMarshaller();
- JAXBElement<AuthnRequestType> jaxb = JBossSAMLAuthnRequestFactory.getObjectFactory().createAuthnRequest(requestType);
- marshaller.marshal(jaxb, os);
+ JAXBElement<?> j = JAXBElementMappingUtil.get(requestType);
+ marshaller.marshal(j, os);
}
/**
@@ -155,10 +167,10 @@
* @param writer
* @throws Exception
*/
- public void marshall(AuthnRequestType requestType, Writer writer) throws Exception
+ public void marshall(RequestAbstractType requestType, Writer writer) throws Exception
{
Marshaller marshaller = JBossSAMLAuthnRequestFactory.getValidatingMarshaller();
- JAXBElement<AuthnRequestType> jaxb = JBossSAMLAuthnRequestFactory.getObjectFactory().createAuthnRequest(requestType);
- marshaller.marshal(jaxb, writer);
+ JAXBElement<?> j = JAXBElementMappingUtil.get(requestType);
+ marshaller.marshal(j, writer);
}
}
\ No newline at end of file
Modified: identity-federation/trunk/identity-fed-core/.classpath
===================================================================
--- identity-federation/trunk/identity-fed-core/.classpath 2009-01-22 21:23:24 UTC (rev 245)
+++ identity-federation/trunk/identity-fed-core/.classpath 2009-01-23 04:45:10 UTC (rev 246)
@@ -9,5 +9,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-xacml/2.0.3-SNAPSHOT/jboss-xacml-2.0.3-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
<classpathentry kind="output" path="target-eclipse"/>
</classpath>
Modified: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java
===================================================================
--- identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java 2009-01-22 21:23:24 UTC (rev 245)
+++ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java 2009-01-23 04:45:10 UTC (rev 246)
@@ -36,7 +36,11 @@
SIGNATURE_DSA_SHA1("http://www.w3.org/2000/09/xmldsig#dsa-sha1"),
SIGNATURE_RSA_SHA1("http://www.w3.org/2000/09/xmldsig#rsa-sha1"),
SUBJECT_CONFIRMATION_BEARER("urn:oasis:names:tc:SAML:2.0:cm:bearer"),
+ STATUS_AUTHNFAILED("urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"),
+ STATUS_REQUESTOR("urn:oasis:names:tc:SAML:2.0:status:Requestor"),
+ STATUS_RESPONDER("urn:oasis:names:tc:SAML:2.0:status:Responder"),
STATUS_SUCCESS("urn:oasis:names:tc:SAML:2.0:status:Success"),
+ STATUS_VERSION_MISMATCH("urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"),
TRANSFORM_ENVELOPED_SIGNATURE("http://www.w3.org/2000/09/xmldsig#enveloped-signature"),
TRANSFORM_C14N_EXCL_OMIT_COMMENTS("http://www.w3.org/2001/10/xml-exc-c14n#WithComments");
Added: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/JAXBElementMappingUtil.java
===================================================================
--- identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/JAXBElementMappingUtil.java (rev 0)
+++ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/JAXBElementMappingUtil.java 2009-01-23 04:45:10 UTC (rev 246)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.core.saml.v2.util;
+
+import javax.xml.bind.JAXBElement;
+
+import org.jboss.identity.federation.saml.v2.protocol.ArtifactResolveType;
+import org.jboss.identity.federation.saml.v2.protocol.AssertionIDRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.LogoutRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.ManageNameIDRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.NameIDMappingRequestType;
+import org.jboss.identity.federation.saml.v2.protocol.ObjectFactory;
+import org.jboss.identity.federation.saml.v2.protocol.RequestAbstractType;
+
+/**
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 22, 2009
+ */
+public class JAXBElementMappingUtil
+{
+ public static JAXBElement<?> get(RequestAbstractType requestAbstractType)
+ {
+ ObjectFactory factory = new ObjectFactory();
+ if(requestAbstractType instanceof AuthnRequestType)
+ {
+ AuthnRequestType art = (AuthnRequestType) requestAbstractType;
+ return factory.createAuthnRequest(art);
+ }
+
+ if(requestAbstractType instanceof LogoutRequestType)
+ {
+ LogoutRequestType lrt = (LogoutRequestType) requestAbstractType;
+ return factory.createLogoutRequest(lrt);
+ }
+ if(requestAbstractType instanceof AssertionIDRequestType)
+ {
+ AssertionIDRequestType airt = (AssertionIDRequestType) requestAbstractType;
+ return factory.createAssertionIDRequest(airt);
+ }
+ if(requestAbstractType instanceof NameIDMappingRequestType)
+ {
+ NameIDMappingRequestType airt = (NameIDMappingRequestType) requestAbstractType;
+ return factory.createNameIDMappingRequest(airt);
+ }
+ if(requestAbstractType instanceof ArtifactResolveType)
+ {
+ ArtifactResolveType airt = (ArtifactResolveType) requestAbstractType;
+ return factory.createArtifactResolve(airt);
+ }
+ if(requestAbstractType instanceof ManageNameIDRequestType)
+ {
+ ManageNameIDRequestType airt = (ManageNameIDRequestType) requestAbstractType;
+ return factory.createManageNameIDRequest(airt);
+ }
+ throw new IllegalArgumentException("Unknown Type:"+requestAbstractType);
+ }
+}
\ No newline at end of file
15 years, 3 months
- 1
- 0
JBoss Identity SVN: r245 - in identity-federation/trunk: identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-01-22 16:23:24 -0500 (Thu, 22 Jan 2009)
New Revision: 245
Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java
Log:
correct method name
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-22 21:19:38 UTC (rev 244)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-22 21:23:24 UTC (rev 245)
@@ -201,7 +201,7 @@
List<String> roles = rg.generateRoles(userPrincipal);
AssertionType assertion = (AssertionType) responseType.getAssertionOrEncryptedAssertion().get(0);
- AttributeStatementType attrStatement = saml2Response.createAttributeStatements(roles);
+ AttributeStatementType attrStatement = saml2Response.createAttributeStatement(roles);
assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(attrStatement);
//Add timed conditions
Modified: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java
===================================================================
--- identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-01-22 21:19:38 UTC (rev 244)
+++ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-01-22 21:23:24 UTC (rev 245)
@@ -55,7 +55,7 @@
* @param roles
* @return
*/
- public AttributeStatementType createAttributeStatements(List<String> roles)
+ public AttributeStatementType createAttributeStatement(List<String> roles)
{
AttributeStatementType attrStatement = JBossSAMLBaseFactory.createAttributeStatement();
for(String role: roles)
15 years, 3 months
- 1
- 0
JBoss Identity SVN: r244 - in identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings: util and 1 other directory.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-01-22 16:19:38 -0500 (Thu, 22 Jan 2009)
New Revision: 244
Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/ValveUtil.java
Log:
use config
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-22 20:46:48 UTC (rev 243)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-22 21:19:38 UTC (rev 244)
@@ -31,17 +31,24 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
+import org.apache.catalina.Context;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.LifecycleListener;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
+import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.valves.ValveBase;
import org.apache.log4j.Logger;
import org.jboss.identity.federation.api.saml.v2.common.IDGenerator;
import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
+import org.jboss.identity.federation.bindings.config.IDP;
import org.jboss.identity.federation.bindings.interfaces.RoleGenerator;
import org.jboss.identity.federation.bindings.tomcat.TomcatRoleGenerator;
import org.jboss.identity.federation.bindings.util.HTTPRedirectUtil;
import org.jboss.identity.federation.bindings.util.RedirectBindingUtil;
+import org.jboss.identity.federation.bindings.util.ValveUtil;
import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
import org.jboss.identity.federation.core.saml.v2.holders.IDPInfoHolder;
import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
@@ -56,26 +63,18 @@
* @author Anil.Saldhana(a)redhat.com
* @since Dec 9, 2008
*/
-public class IDPRedirectValve extends ValveBase
+public class IDPRedirectValve extends ValveBase implements Lifecycle
{
- private static Logger log = Logger.getLogger(IDPRedirectValve.class); ;
+ private static Logger log = Logger.getLogger(IDPRedirectValve.class);
+ protected IDP idpConfiguration = null;
+
private RoleGenerator rg = new TomcatRoleGenerator();
private long assertionValidity = 5000; // 5minutes in seconds
- private String identityURL = null;
-
- public void setAssertionValidity(String validity)
- {
- assertionValidity = Long.parseLong(validity);
- }
+ private String identityURL = null;
- public void setIdentityURL(String url)
- {
- this.identityURL = url;
- }
-
public IDPRedirectValve()
{
super();
@@ -224,4 +223,103 @@
{
return request.getParameter("SAMLRequest");
}
+
+ //***************Catalina Lifecyle methods
+ /**
+ * The lifecycle event support for this component.
+ */
+ protected LifecycleSupport lifecycle = new LifecycleSupport(this);
+
+ /**
+ * Has this component been started yet?
+ */
+ private boolean started = false;
+
+
+
+ /**
+ * Add a lifecycle event listener to this component.
+ *
+ * @param listener The listener to add
+ */
+ public void addLifecycleListener(LifecycleListener listener)
+ {
+ lifecycle.addLifecycleListener(listener);
+ }
+
+
+ /**
+ * Get the lifecycle listeners associated with this lifecycle. If this
+ * Lifecycle has no listeners registered, a zero-length array is returned.
+ */
+ public LifecycleListener[] findLifecycleListeners()
+ {
+ return lifecycle.findLifecycleListeners();
+ }
+
+
+ /**
+ * Remove a lifecycle event listener from this component.
+ *
+ * @param listener The listener to add
+ */
+ public void removeLifecycleListener(LifecycleListener listener)
+ {
+ lifecycle.removeLifecycleListener(listener);
+ }
+
+
+ /**
+ * Prepare for the beginning of active use of the public methods of this
+ * component. This method should be called after <code>configure()</code>,
+ * and before any of the public methods of the component are utilized.
+ *
+ * @exception LifecycleException if this component detects a fatal error
+ * that prevents this component from being used
+ */
+ public void start() throws LifecycleException
+ {
+ // Validate and update our current component state
+ if (started)
+ throw new LifecycleException
+ ("IDPRedirectValve already Started");
+ lifecycle.fireLifecycleEvent(START_EVENT, null);
+ started = true;
+
+ String configFile = "WEB-INF/jboss-idfed.xml";
+ Context context = (Context) getContainer();
+ InputStream is = context.getServletContext().getResourceAsStream(configFile);
+ if(is == null)
+ throw new RuntimeException(configFile + " missing");
+ try
+ {
+ idpConfiguration = ValveUtil.getIDPConfiguration(is);
+ this.identityURL = idpConfiguration.getIdentityURL();
+ log.trace("Identity Provider URL=" + this.identityURL);
+ this.assertionValidity = idpConfiguration.getAssertionValidity();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ /**
+ * Gracefully terminate the active use of the public methods of this
+ * component. This method should be the last one called on a given
+ * instance of this component.
+ *
+ * @exception LifecycleException if this component detects a fatal error
+ * that needs to be reported
+ */
+ public void stop() throws LifecycleException
+ {
+ // Validate and update our current component state
+ if (!started)
+ throw new LifecycleException
+ ("IDPRedirectValve NotStarted");
+ lifecycle.fireLifecycleEvent(STOP_EVENT, null);
+ started = false;
+ }
}
\ No newline at end of file
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-01-22 20:46:48 UTC (rev 243)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-01-22 21:19:38 UTC (rev 244)
@@ -21,16 +21,15 @@
*/
package org.jboss.identity.federation.bindings.tomcat.idp;
-import java.io.InputStream;
-import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.PublicKey;
+import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Request;
import org.apache.log4j.Logger;
+import org.jboss.identity.federation.bindings.config.KeyProvider;
+import org.jboss.identity.federation.bindings.interfaces.TrustKeyManager;
import org.jboss.identity.federation.bindings.util.RedirectBindingSignatureUtil;
-import org.jboss.identity.federation.bindings.util.ValveUtil;
-import org.jboss.identity.federation.bindings.util.cert.KeyStoreUtil;
import org.jboss.identity.federation.core.saml.v2.util.SignatureUtil;
@@ -41,17 +40,13 @@
* @since Jan 14, 2009
*/
public class IDPRedirectWithSignatureValve extends IDPRedirectValve
-{
- private static Logger log = Logger.getLogger(IDPRedirectWithSignatureValve.class);
- private String keyStore;
- private char[] keypass;
- private String alias;
- private String keyStorePass;
+{
+ private static Logger log = Logger.getLogger(IDPRedirectWithSignatureValve.class);
- private KeyStore ks = null;
-
private boolean ignoreSignature = false;
+ private TrustKeyManager keyManager;
+
public IDPRedirectWithSignatureValve()
{
super();
@@ -61,28 +56,33 @@
{
if(val != null && val.length() > 0)
this.ignoreSignature = Boolean.valueOf(val);
- }
-
- public void setKeyStore(String keyStore)
- {
- this.keyStore = keyStore;
- }
+ }
- public void setKeyStorePass(String keyStorePass)
- {
- this.keyStorePass = keyStorePass;
- }
+ @Override
+ public void start() throws LifecycleException
+ {
+ super.start();
+ KeyProvider keyProvider = this.idpConfiguration.getKeyProvider();
+ try
+ {
+ ClassLoader tcl = SecurityActions.getContextClassLoader();
+ String keyManagerClassName = keyProvider.getClassName();
+ if(keyManagerClassName == null)
+ throw new RuntimeException("KeyManager class name is null");
+
+ Class<?> clazz = tcl.loadClass(keyManagerClassName);
+ this.keyManager = (TrustKeyManager) clazz.newInstance();
+ keyManager.setAuthProperties(keyProvider.getAuth());
+ keyManager.setValidatingAlias(keyProvider.getValidatingAlias());
+ }
+ catch(Exception e)
+ {
+ log.error("Exception reading configuration:",e);
+ throw new LifecycleException(e.getLocalizedMessage());
+ }
+ log.trace("Key Provider=" + keyProvider.getClassName());
+ }
- public void setKeyPass(String keypass)
- {
- this.keypass = keypass.toCharArray();
- }
-
- public void setAlias(String alias)
- {
- this.alias = alias;
- }
-
protected boolean validate(Request request) throws Exception
{
boolean result = super.validate(request);
@@ -115,7 +115,7 @@
}
sb.append("&SigAlg=").append(sigAlgFromURL);
- PublicKey validatingKey = getValidatingKey();
+ PublicKey validatingKey = keyManager.getValidatingKey(request.getRemoteAddr());
boolean isValid = SignatureUtil.validate(sb.toString().getBytes("UTF-8"), sigValue, validatingKey);
return isValid;
}
@@ -126,7 +126,7 @@
try
{
//Get the signing key
- PrivateKey signingKey = getSigningKey();
+ PrivateKey signingKey = keyManager.getSigningKey();
StringBuffer sb = new StringBuffer();
String url = RedirectBindingSignatureUtil.getSAMLResponseURLWithSignature(urlEncodedResponse, urlEncodedRelayState, signingKey);
sb.append("?").append(url);
@@ -137,25 +137,4 @@
throw new RuntimeException(e);
}
}
-
-
- protected PrivateKey getSigningKey() throws Exception
- {
- if(ks == null)
- {
- InputStream is = ValveUtil.getKeyStoreInputStream(this.keyStore);
- ks = KeyStoreUtil.getKeyStore(is, keyStorePass.toCharArray());
- }
- return (PrivateKey) ks.getKey(alias, keypass);
- }
-
- protected PublicKey getValidatingKey() throws Exception
- {
- if(ks == null)
- {
- InputStream is = ValveUtil.getKeyStoreInputStream(this.keyStore);
- ks = KeyStoreUtil.getKeyStore(is, keyStorePass.toCharArray());
- }
- return KeyStoreUtil.getPublicKey(ks, alias, keypass);
- }
}
\ No newline at end of file
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/ValveUtil.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/ValveUtil.java 2009-01-22 20:46:48 UTC (rev 243)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/ValveUtil.java 2009-01-22 21:19:38 UTC (rev 244)
@@ -29,7 +29,8 @@
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Unmarshaller;
-import org.jboss.identity.federation.bindings.config.SP;
+import org.jboss.identity.federation.bindings.config.IDP;
+import org.jboss.identity.federation.bindings.config.SP;
import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory;
/**
@@ -72,6 +73,18 @@
}
@SuppressWarnings("unchecked")
+ public static IDP getIDPConfiguration(InputStream is) throws Exception
+ {
+ if(is == null)
+ throw new IllegalArgumentException("inputstream is null");
+ String schema = "schema/config/jboss-identity-fed.xsd";
+
+ Unmarshaller un = JBossSAMLBaseFactory.getValidatingUnmarshaller("org.jboss.identity.federation.bindings.config", schema);
+ JAXBElement<IDP> jaxbSp = (JAXBElement<IDP>) un.unmarshal(is);
+ return jaxbSp.getValue();
+ }
+
+ @SuppressWarnings("unchecked")
public static SP getSPConfiguration(InputStream is) throws Exception
{
if(is == null)
15 years, 3 months
- 1
- 0
JBoss Identity SVN: r243 - in identity-federation/trunk: assembly and 202 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-01-22 15:46:48 -0500 (Thu, 22 Jan 2009)
New Revision: 243
Modified:
identity-federation/trunk/
identity-federation/trunk/assembly/
identity-federation/trunk/identity-bindings/
identity-federation/trunk/identity-bindings/src/
identity-federation/trunk/identity-bindings/src/main/
identity-federation/trunk/identity-bindings/src/main/java/
identity-federation/trunk/identity-bindings/src/main/java/org/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/subject/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/
identity-federation/trunk/identity-bindings/src/main/resources/
identity-federation/trunk/identity-bindings/src/main/resources/schema/
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/
identity-federation/trunk/identity-bindings/src/test/
identity-federation/trunk/identity-bindings/src/test/java/
identity-federation/trunk/identity-bindings/src/test/java/org/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/bindings/
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/helpers/
identity-federation/trunk/identity-bindings/src/test/resources/
identity-federation/trunk/identity-bindings/src/test/resources/config/
identity-federation/trunk/identity-bindings/src/test/resources/keystore/
identity-federation/trunk/identity-fed-api/
identity-federation/trunk/identity-fed-api/src/
identity-federation/trunk/identity-fed-api/src/main/
identity-federation/trunk/identity-fed-api/src/main/java/
identity-federation/trunk/identity-fed-api/src/main/java/org/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/common/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/
identity-federation/trunk/identity-fed-api/src/main/resources/
identity-federation/trunk/identity-fed-api/src/test/
identity-federation/trunk/identity-fed-api/src/test/java/
identity-federation/trunk/identity-fed-api/src/test/java/org/
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/
identity-federation/trunk/identity-fed-api/src/test/resources/
identity-federation/trunk/identity-fed-api/src/test/resources/saml/
identity-federation/trunk/identity-fed-api/src/test/resources/saml/v2/
identity-federation/trunk/identity-fed-api/src/test/resources/saml/v2/authnrequest/
identity-federation/trunk/identity-fed-core/
identity-federation/trunk/identity-fed-core/src/
identity-federation/trunk/identity-fed-core/src/main/
identity-federation/trunk/identity-fed-core/src/main/java/
identity-federation/trunk/identity-fed-core/src/main/java/org/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/exceptions/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/holders/
identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/
identity-federation/trunk/identity-fed-core/src/main/resources/
identity-federation/trunk/identity-fed-core/src/test/
identity-federation/trunk/identity-fed-core/src/test/java/
identity-federation/trunk/identity-fed-core/src/test/java/org/
identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/
identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/
identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/
identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/
identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/
identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/util/
identity-federation/trunk/identity-fed-core/src/test/resources/
identity-federation/trunk/identity-fed-core/src/test/resources/saml-xacml/
identity-federation/trunk/identity-fed-model/
identity-federation/trunk/identity-fed-model/src/
identity-federation/trunk/identity-fed-model/src/main/
identity-federation/trunk/identity-fed-model/src/main/java/
identity-federation/trunk/identity-fed-model/src/main/java/org/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/soap/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/soap/envelope/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/authenticatedtelephony/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/internetprotocol/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/internetprotocolpassword/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/kerberos/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobileonefactorcontract/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobileonefactorunregistered/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobiletwofactorcontract/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobiletwofactorunregistered/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/nomadtelephony/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/password/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/passwordprotectedtransport/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/personalizedtelephony/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/pgp/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/previoussession/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/secureremotepassword/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/smartcard/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/smartcardpki/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/softwarepki/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/spki/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/telephony/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/timesynctoken/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/tlsclient/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/x509/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/xmldsig/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/assertion/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/generated/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/generated/runtime/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/metadata/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/attribute/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/attribute/dce/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/sso/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/sso/ecp/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/assertion/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/protocol/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/addressing/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/policy/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/trust/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/secext/
identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/utility/
identity-federation/trunk/identity-fed-model/src/main/resources/
identity-federation/trunk/identity-fed-model/src/main/resources/schema/
identity-federation/trunk/identity-fed-model/src/main/resources/schema/saml/
identity-federation/trunk/identity-fed-model/src/main/resources/schema/saml/v2/
identity-federation/trunk/identity-fed-model/src/main/resources/schema/wstrust/
identity-federation/trunk/identity-fed-model/src/main/resources/schema/wstrust/v1_3/
identity-federation/trunk/identity-fed-model/src/test/
identity-federation/trunk/identity-fed-model/src/test/java/
identity-federation/trunk/identity-fed-model/src/test/java/org/
identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/
identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/
identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/
identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/
identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/ws/
identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/ws/trust/
identity-federation/trunk/identity-fed-model/src/test/resources/
identity-federation/trunk/identity-fed-model/src/test/resources/endorsed/
identity-federation/trunk/identity-fed-model/src/test/resources/saml/
identity-federation/trunk/identity-fed-model/src/test/resources/saml/v2/
identity-federation/trunk/identity-fed-model/src/test/resources/wstrust/
identity-federation/trunk/identity-samples/
identity-federation/trunk/identity-samples/employee/
identity-federation/trunk/identity-samples/employee/resources/
identity-federation/trunk/identity-samples/employee/resources/META-INF/
identity-federation/trunk/identity-samples/employee/resources/WEB-INF/
identity-federation/trunk/identity-samples/sales/
identity-federation/trunk/identity-samples/sales/resources/
identity-federation/trunk/identity-samples/sales/resources/META-INF/
identity-federation/trunk/identity-samples/sales/resources/WEB-INF/
identity-federation/trunk/identity-xmlsecmodel/
identity-federation/trunk/identity-xmlsecmodel/src/
identity-federation/trunk/identity-xmlsecmodel/src/main/
identity-federation/trunk/identity-xmlsecmodel/src/main/java/
identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/
identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/
identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/
identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/
identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/
identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/xmldsig/
identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/xmlenc/
identity-federation/trunk/identity-xmlsecmodel/src/main/resources/
identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/
identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/
identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/xmldsig/
identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/xmlenc/
identity-federation/trunk/parent/
Log:
recursively ignore target
Property changes on: identity-federation/trunk
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/assembly
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/subject
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/resources
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/resources/schema
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/main/resources/schema/config
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/bindings
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/helpers
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/resources
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/resources/config
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-bindings/src/test/resources/keystore
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/common
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/main/resources
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/java
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources/saml
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources/saml/v2
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources/saml/v2/authnrequest
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/exceptions
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/holders
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/main/resources
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/java
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/core
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/util
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/resources
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-core/src/test/resources/saml-xacml
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/soap
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/soap/envelope
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/authenticatedtelephony
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/internetprotocol
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/internetprotocolpassword
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/kerberos
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobileonefactorcontract
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobileonefactorunregistered
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobiletwofactorcontract
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobiletwofactorunregistered
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/nomadtelephony
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/password
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/passwordprotectedtransport
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/personalizedtelephony
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/pgp
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/previoussession
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/secureremotepassword
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/smartcard
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/smartcardpki
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/softwarepki
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/spki
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/telephony
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/timesynctoken
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/tlsclient
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/x509
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/xmldsig
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/assertion
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/generated
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/generated/runtime
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/metadata
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/attribute
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/attribute/dce
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/sso
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/sso/ecp
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/assertion
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/protocol
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/addressing
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/policy
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/trust
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/secext
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/utility
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema/saml
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema/saml/v2
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema/wstrust
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema/wstrust/v1_3
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/java
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/ws
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/ws/trust
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources/endorsed
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources/saml
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources/saml/v2
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources/wstrust
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-samples
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-samples/employee
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-samples/employee/resources
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-samples/employee/resources/META-INF
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-samples/employee/resources/WEB-INF
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-samples/sales
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-samples/sales/resources
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-samples/sales/resources/META-INF
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-samples/sales/resources/WEB-INF
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/xmldsig
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/xmlenc
___________________________________________________________________
Name: svn:ignore
- target target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/xmldsig
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/xmlenc
___________________________________________________________________
Name: svn:ignore
+ .metadata
target
target-eclipse
Property changes on: identity-federation/trunk/parent
___________________________________________________________________
Name: svn:ignore
- target
target-eclipse .settings eclipse-target
+ .metadata
target
target-eclipse
15 years, 3 months
- 1
- 0
JBoss Identity SVN: r242 - identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-01-22 15:42:37 -0500 (Thu, 22 Jan 2009)
New Revision: 242
Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/SecurityActions.java
Log:
fix pkg name
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/SecurityActions.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/SecurityActions.java 2009-01-22 20:38:25 UTC (rev 241)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/SecurityActions.java 2009-01-22 20:42:37 UTC (rev 242)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.identity.federation.bindings.util.cert;
+package org.jboss.identity.federation.bindings.util;
import java.security.AccessController;
import java.security.PrivilegedAction;
15 years, 3 months
- 1
- 0
JBoss Identity SVN: r241 - in identity-federation/trunk/identity-bindings/src: main/java/org/jboss/identity/federation/bindings/interfaces and 8 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: anil.saldhana(a)jboss.com
Date: 2009-01-22 15:38:25 -0500 (Thu, 22 Jan 2009)
New Revision: 241
Added:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyManager.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/SecurityActions.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/ValveUtil.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/SecurityActions.java
identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-3.xml
Modified:
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/Provider.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/RedirectBindingSignatureUtil.java
identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd
identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java
Log:
use config
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java 2009-01-22 18:14:45 UTC (rev 240)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -33,6 +33,8 @@
private final static QName _JBossIDP_QNAME = new QName("urn:jboss:identity-federation:config:1.0", "JBossIDP");
+ private final static QName _JBossSP_QNAME = new QName("urn:jboss:identity-federation:config:1.0", "JBossSP");
+
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.identity.federation.bindings.config
*
@@ -105,4 +107,12 @@
return new JAXBElement<IDP>(_JBossIDP_QNAME, IDP.class, null, value);
}
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link SP }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "urn:jboss:identity-federation:config:1.0", name = "JBossSP")
+ public JAXBElement<SP> createJBossSP(SP value) {
+ return new JAXBElement<SP>(_JBossSP_QNAME, SP.class, null, value);
+ }
}
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/Provider.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/Provider.java 2009-01-22 18:14:45 UTC (rev 240)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/Provider.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -52,7 +52,7 @@
@XmlElement(name = "IdentityURL", required = true)
protected String identityURL;
- @XmlElement(name = "Trust", required = true)
+ @XmlElement(name = "Trust")
protected Trust trust;
@XmlElement(name = "KeyProvider")
protected KeyProvider keyProvider;
Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyManager.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyManager.java (rev 0)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/TrustKeyManager.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.bindings.interfaces;
+
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.util.List;
+
+import org.jboss.identity.federation.bindings.config.AuthProperty;
+import org.jboss.identity.federation.bindings.config.KeyValue;
+
+/**
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 22, 2009
+ */
+public interface TrustKeyManager
+{
+ void setAuthProperties(List<AuthProperty> authList) throws Exception;
+ void setValidatingAlias(List<KeyValue> aliases) throws Exception;
+ PrivateKey getSigningKey() throws Exception;
+ PublicKey getValidatingKey(String domain) throws Exception;
+}
\ No newline at end of file
Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java (rev 0)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/KeyStoreKeyManager.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -0,0 +1,128 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.bindings.tomcat;
+
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.UnrecoverableKeyException;
+import java.util.HashMap;
+import java.util.List;
+
+import org.jboss.identity.federation.bindings.config.AuthProperty;
+import org.jboss.identity.federation.bindings.config.KeyValue;
+import org.jboss.identity.federation.bindings.interfaces.TrustKeyManager;
+import org.jboss.identity.federation.bindings.util.ValveUtil;
+import org.jboss.identity.federation.bindings.util.cert.KeyStoreUtil;
+
+/**
+ * KeyStore based Trust Key Manager
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 22, 2009
+ */
+public class KeyStoreKeyManager implements TrustKeyManager
+{
+ private HashMap<String,String> domainAliasMap = new HashMap<String,String>();
+ private HashMap<String,String> authPropsMap = new HashMap<String,String>();
+
+ private KeyStore ks = null;
+
+ private String keyStoreURL;
+ private char[] signingKeyPass;
+ private String signingAlias;
+ private String keyStorePass;
+
+ public static final String KEYSTORE_URL = "KeyStoreURL";
+ public static final String KEYSTORE_PASS = "KeyStorePass";
+ public static final String SIGNING_KEY_PASS = "SigningKeyPass";
+ public static final String SIGNING_KEY_ALIAS = "SigningKeyAlias";
+
+ /**
+ * @see TrustKeyManager#getSigningKey()
+ */
+ public PrivateKey getSigningKey() throws Exception
+ {
+ if(ks == null)
+ throw new IllegalStateException("KeyStore is null");
+ return (PrivateKey) ks.getKey(this.signingAlias, this.signingKeyPass);
+ }
+
+ /**
+ * @see TrustKeyManager#getValidatingKey(String)
+ */
+ public PublicKey getValidatingKey(String domain) throws Exception
+ {
+ if(ks == null)
+ throw new IllegalStateException("KeyStore is null");
+ String domainAlias = this.domainAliasMap.get(domain);
+ if(domainAlias == null)
+ throw new IllegalStateException("Domain Alias missing for "+ domain);
+ PublicKey publicKey = null;
+ try
+ {
+ publicKey = KeyStoreUtil.getPublicKey(ks, domainAlias, this.keyStorePass.toCharArray());
+ }
+ catch(UnrecoverableKeyException urke)
+ {
+ //Try with the signing key pass
+ publicKey = KeyStoreUtil.getPublicKey(ks, domainAlias, this.signingKeyPass);
+ }
+ return publicKey;
+ }
+
+ /**
+ * @see TrustKeyManager#setAuthProperties(List)
+ */
+ public void setAuthProperties(List<AuthProperty> authList) throws Exception
+ {
+ for(AuthProperty auth: authList)
+ {
+ this.authPropsMap.put(auth.getKey(), auth.getValue());
+ }
+
+ this.keyStoreURL = this.authPropsMap.get(KEYSTORE_URL);
+ this.keyStorePass = this.authPropsMap.get(KEYSTORE_PASS);
+
+
+ this.signingAlias = this.authPropsMap.get(SIGNING_KEY_ALIAS);
+
+ String keypass = this.authPropsMap.get(SIGNING_KEY_PASS);
+ if(keypass == null || keypass.length() == 0)
+ throw new RuntimeException("Signing Key Pass is null");
+ this.signingKeyPass = keypass.toCharArray();
+
+ InputStream is = ValveUtil.getKeyStoreInputStream(this.keyStoreURL);
+ ks = KeyStoreUtil.getKeyStore(is, keyStorePass.toCharArray());
+ }
+
+ /**
+ * @see TrustKeyManager#setValidatingAlias(List)
+ */
+ public void setValidatingAlias(List<KeyValue> aliases)
+ {
+ for(KeyValue alias: aliases)
+ {
+ domainAliasMap.put(alias.getKey(), alias.getValue());
+ }
+ }
+}
\ No newline at end of file
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-22 18:14:45 UTC (rev 240)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -58,7 +58,7 @@
*/
public class IDPRedirectValve extends ValveBase
{
- protected static Logger log = null;
+ private static Logger log = Logger.getLogger(IDPRedirectValve.class); ;
private RoleGenerator rg = new TomcatRoleGenerator();
@@ -79,7 +79,6 @@
public IDPRedirectValve()
{
super();
- log = Logger.getLogger(IDPRedirectValve.class);
}
@Override
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-01-22 18:14:45 UTC (rev 240)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectWithSignatureValve.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -21,17 +21,15 @@
*/
package org.jboss.identity.federation.bindings.tomcat.idp;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
-import java.net.URL;
import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.PublicKey;
-import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Request;
import org.apache.log4j.Logger;
import org.jboss.identity.federation.bindings.util.RedirectBindingSignatureUtil;
+import org.jboss.identity.federation.bindings.util.ValveUtil;
import org.jboss.identity.federation.bindings.util.cert.KeyStoreUtil;
import org.jboss.identity.federation.core.saml.v2.util.SignatureUtil;
@@ -44,6 +42,7 @@
*/
public class IDPRedirectWithSignatureValve extends IDPRedirectValve
{
+ private static Logger log = Logger.getLogger(IDPRedirectWithSignatureValve.class);
private String keyStore;
private char[] keypass;
private String alias;
@@ -55,8 +54,7 @@
public IDPRedirectWithSignatureValve()
{
- super();
- log = Logger.getLogger(IDPRedirectWithSignatureValve.class);
+ super();
}
public void setIgnoreSignature(String val)
@@ -140,38 +138,12 @@
}
}
- private InputStream getKeyStoreInputStream()
- {
- InputStream is = null;
-
- try
- {
- //Try the file method
- File file = new File(keyStore);
- is = new FileInputStream(file);
- }
- catch(Exception e)
- {
- try
- {
- URL url = new URL(keyStore);
- is = url.openStream();
- }
- catch(Exception ex)
- {
- is = SecurityActions.getContextClassLoader().getResourceAsStream(keyStore);
- }
- }
- if(is == null)
- throw new RuntimeException("Keystore not located");
- return is;
- }
protected PrivateKey getSigningKey() throws Exception
{
if(ks == null)
{
- InputStream is = this.getKeyStoreInputStream();
+ InputStream is = ValveUtil.getKeyStoreInputStream(this.keyStore);
ks = KeyStoreUtil.getKeyStore(is, keyStorePass.toCharArray());
}
return (PrivateKey) ks.getKey(alias, keypass);
@@ -181,7 +153,7 @@
{
if(ks == null)
{
- InputStream is = this.getKeyStoreInputStream();
+ InputStream is = ValveUtil.getKeyStoreInputStream(this.keyStore);
ks = KeyStoreUtil.getKeyStore(is, keyStorePass.toCharArray());
}
return KeyStoreUtil.getPublicKey(ks, alias, keypass);
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-01-22 18:14:45 UTC (rev 240)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -28,6 +28,7 @@
import javax.servlet.ServletException;
+import org.apache.catalina.LifecycleException;
import org.apache.catalina.Session;
import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.authenticator.FormAuthenticator;
@@ -40,10 +41,12 @@
import org.jboss.identity.federation.api.saml.v2.response.SAML2Response;
import org.jboss.identity.federation.api.util.Base64;
import org.jboss.identity.federation.api.util.DeflateUtil;
+import org.jboss.identity.federation.bindings.config.SP;
import org.jboss.identity.federation.bindings.jboss.DefaultJBossSubjectRegistration;
import org.jboss.identity.federation.bindings.jboss.JBossSubjectRegistration;
import org.jboss.identity.federation.bindings.util.HTTPRedirectUtil;
import org.jboss.identity.federation.bindings.util.RedirectBindingUtil;
+import org.jboss.identity.federation.bindings.util.ValveUtil;
import org.jboss.identity.federation.core.saml.v2.exceptions.AssertionExpiredException;
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
import org.jboss.identity.federation.saml.v2.protocol.ResponseType;
@@ -56,10 +59,13 @@
* @author Anil.Saldhana(a)redhat.com
* @since Dec 12, 2008
*/
-public class SPRedirectFormAuthenticator extends FormAuthenticator
+public class SPRedirectFormAuthenticator extends FormAuthenticator
{
- protected static Logger log = null;
+
+ private static Logger log = Logger.getLogger(SPRedirectFormAuthenticator.class);
+ protected SP spConfiguration = null;
+
private String serviceURL = null;
private String identityURL = null;
@@ -68,20 +74,9 @@
public SPRedirectFormAuthenticator()
{
- super();
- log = Logger.getLogger(SPRedirectFormAuthenticator.class);
- }
+ super();
+ }
- public void setIdentityURL(String url)
- {
- this.identityURL = url;
- }
-
- public void setServiceURL(String url)
- {
- this.serviceURL = url;
- }
-
/**
* For JBoss Deployment, you can change the value of
* the {@code}JBossSubjectRegistration class
@@ -94,6 +89,27 @@
Class<?> clazz = tcl.loadClass(fqn);
this.jbossRegistration = (JBossSubjectRegistration) clazz.newInstance();
}
+
+ @Override
+ public void start() throws LifecycleException
+ {
+ String configFile = "WEB-INF/jboss-idfed.xml";
+ super.start();
+ InputStream is = context.getServletContext().getResourceAsStream(configFile);
+ if(is == null)
+ throw new RuntimeException(configFile + " missing");
+ try
+ {
+ spConfiguration = ValveUtil.getSPConfiguration(is);
+ this.identityURL = spConfiguration.getIdentityURL();
+ this.serviceURL = spConfiguration.getServiceURL();
+ log.trace("Identity Provider URL=" + this.identityURL);
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
@Override
public boolean authenticate(Request request, Response response, LoginConfig loginConfig) throws IOException
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-01-22 18:14:45 UTC (rev 240)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -21,18 +21,15 @@
*/
package org.jboss.identity.federation.bindings.tomcat.sp;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.KeyStore;
import java.security.PrivateKey;
import java.security.PublicKey;
+import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Request;
import org.apache.log4j.Logger;
+import org.jboss.identity.federation.bindings.config.KeyProvider;
+import org.jboss.identity.federation.bindings.interfaces.TrustKeyManager;
import org.jboss.identity.federation.bindings.util.RedirectBindingSignatureUtil;
-import org.jboss.identity.federation.bindings.util.cert.KeyStoreUtil;
import org.jboss.identity.federation.core.saml.v2.util.SignatureUtil;
/**
@@ -43,37 +40,40 @@
*/
public class SPRedirectSignatureFormAuthenticator extends SPRedirectFormAuthenticator
{
- private String keyStore;
- private char[] keypass;
- private String alias;
- private String keyStorePass;
+ private static Logger log = Logger.getLogger(SPRedirectSignatureFormAuthenticator.class);
+
+ private TrustKeyManager keyManager;
public SPRedirectSignatureFormAuthenticator()
{
- super();
- log = Logger.getLogger(SPRedirectSignatureFormAuthenticator.class);
+ super();
}
- public void setKeyStore(String keyStore)
+ @Override
+ public void start() throws LifecycleException
{
- this.keyStore = keyStore;
+ super.start();
+ KeyProvider keyProvider = this.spConfiguration.getKeyProvider();
+ try
+ {
+ ClassLoader tcl = SecurityActions.getContextClassLoader();
+ String keyManagerClassName = keyProvider.getClassName();
+ if(keyManagerClassName == null)
+ throw new RuntimeException("KeyManager class name is null");
+
+ Class<?> clazz = tcl.loadClass(keyManagerClassName);
+ this.keyManager = (TrustKeyManager) clazz.newInstance();
+ keyManager.setAuthProperties(keyProvider.getAuth());
+ keyManager.setValidatingAlias(keyProvider.getValidatingAlias());
+ }
+ catch(Exception e)
+ {
+ log.error("Exception reading configuration:",e);
+ throw new LifecycleException(e.getLocalizedMessage());
+ }
+ log.trace("Key Provider=" + keyProvider.getClassName());
}
- public void setKeyStorePass(String keyStorePass)
- {
- this.keyStorePass = keyStorePass;
- }
-
- public void setKeyPass(String keypass)
- {
- this.keypass = keypass.toCharArray();
- }
-
- public void setAlias(String alias)
- {
- this.alias = alias;
- }
-
protected boolean validate(Request request) throws Exception
{
boolean result = super.validate(request);
@@ -100,7 +100,7 @@
}
sb.append("&SigAlg=").append(sigAlgFromURL);
- PublicKey validatingKey = getValidatingKey();
+ PublicKey validatingKey = keyManager.getValidatingKey(request.getRemoteAddr());
boolean isValid = SignatureUtil.validate(sb.toString().getBytes("UTF-8"), sigValue, validatingKey);
return isValid;
}
@@ -111,7 +111,7 @@
try
{
//Get the signing key
- PrivateKey signingKey = getSigningKey();
+ PrivateKey signingKey = keyManager.getSigningKey();
StringBuffer sb = new StringBuffer();
String url = RedirectBindingSignatureUtil.getSAMLRequestURLWithSignature(urlEncodedRequest, urlEncodedRelayState, signingKey);
sb.append("?").append(url);
@@ -122,45 +122,4 @@
throw new RuntimeException(e);
}
}
-
- private InputStream getKeyStoreInputStream()
- {
- InputStream is = null;
-
- try
- {
- //Try the file method
- File file = new File(keyStore);
- is = new FileInputStream(file);
- }
- catch(Exception e)
- {
- try
- {
- URL url = new URL(keyStore);
- is = url.openStream();
- }
- catch(Exception ex)
- {
- is = SecurityActions.getContextClassLoader().getResourceAsStream(keyStore);
- }
- }
- if(is == null)
- throw new RuntimeException("Keystore not located");
- return is;
- }
-
- protected PrivateKey getSigningKey() throws Exception
- {
- InputStream is = this.getKeyStoreInputStream();
- KeyStore ks = KeyStoreUtil.getKeyStore(is, keyStorePass.toCharArray());
- return (PrivateKey) ks.getKey(alias, keypass);
- }
-
- protected PublicKey getValidatingKey() throws Exception
- {
- InputStream is = this.getKeyStoreInputStream();
- KeyStore ks = KeyStoreUtil.getKeyStore(is, keyStorePass.toCharArray());
- return KeyStoreUtil.getPublicKey(ks, alias, keypass);
- }
}
\ No newline at end of file
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/RedirectBindingSignatureUtil.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/RedirectBindingSignatureUtil.java 2009-01-22 18:14:45 UTC (rev 240)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/RedirectBindingSignatureUtil.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -151,7 +151,8 @@
public static byte[] getSignatureValueFromSignedURL(String signedURL) throws Exception
{
String sigValueTokenValue = getTokenValue(signedURL,"Signature");
-
+ if(sigValueTokenValue == null)
+ throw new IllegalArgumentException("Signature Token is not present");
return RedirectBindingUtil.urlBase64Decode(sigValueTokenValue);
}
Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/SecurityActions.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/SecurityActions.java (rev 0)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/SecurityActions.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.bindings.util.cert;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Privileged Blocks
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Dec 9, 2008
+ */
+class SecurityActions
+{
+ /**
+ * Get the Thread Context ClassLoader
+ * @return
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+}
Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/ValveUtil.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/ValveUtil.java (rev 0)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/ValveUtil.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.bindings.util;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URL;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Unmarshaller;
+
+import org.jboss.identity.federation.bindings.config.SP;
+import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory;
+
+/**
+ * Util for tomcat valves
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Jan 22, 2009
+ */
+public class ValveUtil
+{
+ /**
+ * Seek the input stream to the KeyStore
+ * @param keyStore
+ * @return
+ */
+ public static InputStream getKeyStoreInputStream(String keyStore)
+ {
+ InputStream is = null;
+
+ try
+ {
+ //Try the file method
+ File file = new File(keyStore);
+ is = new FileInputStream(file);
+ }
+ catch(Exception e)
+ {
+ try
+ {
+ URL url = new URL(keyStore);
+ is = url.openStream();
+ }
+ catch(Exception ex)
+ {
+ is = SecurityActions.getContextClassLoader().getResourceAsStream(keyStore);
+ }
+ }
+ if(is == null)
+ throw new RuntimeException("Keystore not located");
+ return is;
+ }
+
+ @SuppressWarnings("unchecked")
+ public static SP getSPConfiguration(InputStream is) throws Exception
+ {
+ if(is == null)
+ throw new IllegalArgumentException("inputstream is null");
+ String schema = "schema/config/jboss-identity-fed.xsd";
+
+ Unmarshaller un = JBossSAMLBaseFactory.getValidatingUnmarshaller("org.jboss.identity.federation.bindings.config", schema);
+ JAXBElement<SP> jaxbSp = (JAXBElement<SP>) un.unmarshal(is);
+ return jaxbSp.getValue();
+ }
+}
\ No newline at end of file
Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/SecurityActions.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/SecurityActions.java (rev 0)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/SecurityActions.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -0,0 +1,48 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.identity.federation.bindings.util.cert;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+/**
+ * Privileged Blocks
+ * @author Anil.Saldhana(a)redhat.com
+ * @since Dec 9, 2008
+ */
+class SecurityActions
+{
+ /**
+ * Get the Thread Context ClassLoader
+ * @return
+ */
+ static ClassLoader getContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+}
Modified: identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-01-22 18:14:45 UTC (rev 240)
+++ identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-01-22 20:38:25 UTC (rev 241)
@@ -88,7 +88,7 @@
minOccurs="1">
</element>
<element name="Trust" type="tns:Trust" maxOccurs="1"
- minOccurs="1">
+ minOccurs="0">
</element>
<element name="KeyProvider" type="tns:KeyProvider"
maxOccurs="1" minOccurs="0">
@@ -114,4 +114,6 @@
<extension base="tns:KeyValue"></extension>
</complexContent>
</complexType>
+
+ <element name="JBossSP" type="tns:SP"></element>
</schema>
\ No newline at end of file
Modified: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-01-22 18:14:45 UTC (rev 240)
+++ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-01-22 20:38:25 UTC (rev 241)
@@ -33,6 +33,7 @@
import org.jboss.identity.federation.bindings.config.IDP;
import org.jboss.identity.federation.bindings.config.KeyProvider;
import org.jboss.identity.federation.bindings.config.KeyValue;
+import org.jboss.identity.federation.bindings.config.SP;
import org.jboss.identity.federation.bindings.config.Trust;
import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory;
@@ -94,7 +95,28 @@
assertTrue("jboss.com trusted", domains.indexOf("jboss.com") > -1);
}
+ public void test03() throws Exception
+ {
+ SP sp = getSP(config + "3.xml");
+ assertEquals("http://localhost:8080/idp", sp.getIdentityURL());
+ assertEquals("http://localhost:8080/sales", sp.getServiceURL());
+ }
+
@SuppressWarnings("unchecked")
+ private SP getSP(String configFile) throws Exception
+ {
+ String schema = "schema/config/jboss-identity-fed.xsd";
+
+ ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+ InputStream is = tcl.getResourceAsStream(configFile);
+ assertNotNull("Inputstream not null", is);
+
+ Unmarshaller un = JBossSAMLBaseFactory.getValidatingUnmarshaller("org.jboss.identity.federation.bindings.config", schema);
+ JAXBElement<SP> jaxbSp = (JAXBElement<SP>) un.unmarshal(is);
+ assertNotNull("SP is not null", jaxbSp);
+ return jaxbSp.getValue();
+ }
+ @SuppressWarnings("unchecked")
private IDP getIDP(String configFile) throws Exception
{
String schema = "schema/config/jboss-identity-fed.xsd";
Added: identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-3.xml
===================================================================
--- identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-3.xml (rev 0)
+++ identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-3.xml 2009-01-22 20:38:25 UTC (rev 241)
@@ -0,0 +1,14 @@
+<JBossSP xmlns="urn:jboss:identity-federation:config:1.0">
+<IdentityURL>http://localhost:8080/idp</IdentityURL>
+<Trust>
+ <Domains>localhost,jboss.com,jboss.org</Domains>
+</Trust>
+<KeyProvider ClassName="SomeClass">
+ <Auth Key="SomeKey" Value="SomeValue" />
+ <Auth Key="DBURL" Value="SomeDBURL" />
+ <ValidatingAlias Key="localhost" Value="localhostalias"/>
+ <ValidatingAlias Key="jboss.com" Value="jbossalias"/>
+</KeyProvider>
+
+<ServiceURL>http://localhost:8080/sales</ServiceURL>
+</JBossSP>
\ No newline at end of file
15 years, 3 months
- 1
- 0
JBoss Identity SVN: r240 - in idm/trunk: idm-api and 2 other directories.
by jboss-identity-commits＠lists.jboss.org
Author: mmoyses
Date: 2009-01-22 13:14:45 -0500 (Thu, 22 Jan 2009)
New Revision: 240
Modified:
idm/trunk/idm-api/
idm/trunk/idm-api/pom.xml
idm/trunk/idm-common/
idm/trunk/idm-common/pom.xml
idm/trunk/idm-spi/
idm/trunk/idm-spi/pom.xml
idm/trunk/idm/
Log:
Adding class diagrams to javadoc
Property changes on: idm/trunk/idm
___________________________________________________________________
Name: svn:ignore
- target
+ target
eclipse-classes
Property changes on: idm/trunk/idm-api
___________________________________________________________________
Name: svn:ignore
- target
+ target
eclipse-classes
Modified: idm/trunk/idm-api/pom.xml
===================================================================
--- idm/trunk/idm-api/pom.xml 2009-01-22 16:44:35 UTC (rev 239)
+++ idm/trunk/idm-api/pom.xml 2009-01-22 18:14:45 UTC (rev 240)
@@ -38,4 +38,34 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Property changes on: idm/trunk/idm-common
___________________________________________________________________
Name: svn:ignore
- target
+ target
eclipse-classes
Modified: idm/trunk/idm-common/pom.xml
===================================================================
--- idm/trunk/idm-common/pom.xml 2009-01-22 16:44:35 UTC (rev 239)
+++ idm/trunk/idm-common/pom.xml 2009-01-22 18:14:45 UTC (rev 240)
@@ -34,4 +34,34 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Property changes on: idm/trunk/idm-spi
___________________________________________________________________
Name: svn:ignore
- target
+ target
eclipse-classes
Modified: idm/trunk/idm-spi/pom.xml
===================================================================
--- idm/trunk/idm-spi/pom.xml 2009-01-22 16:44:35 UTC (rev 239)
+++ idm/trunk/idm-spi/pom.xml 2009-01-22 18:14:45 UTC (rev 240)
@@ -38,4 +38,34 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <doclet>org.jboss.apiviz.APIviz</doclet>
+ <docletArtifact>
+ <groupId>org.jboss.apiviz</groupId>
+ <artifactId>apiviz</artifactId>
+ <version>1.2.5.GA</version>
+ </docletArtifact>
+ <additionalparam>
+ -charset UTF-8
+ -docencoding UTF-8
+ -version
+ -author
+ -breakiterator
+ -windowtitle "${project.name} ${project.version} API Reference"
+ -doctitle "${project.name} ${project.version} API Reference"
+ -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+ -link http://java.sun.com/javase/6/docs/api/
+ -sourceclasspath ${project.build.outputDirectory}
+ </additionalparam>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
15 years, 3 months
- 1
- 0