[jboss-identity-commits] JBoss Identity SVN: r182 - in identity-federation/trunk: identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp and 2 other directories.
jboss-identity-commits at lists.jboss.org
jboss-identity-commits at lists.jboss.org
Mon Jan 5 14:38:27 EST 2009
Author: anil.saldhana at jboss.com
Date: 2009-01-05 14:38:27 -0500 (Mon, 05 Jan 2009)
New Revision: 182
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/sp/SPRedirectFormAuthenticator.java
identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectValve.java
identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLSignatureUtil.java
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java
identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java
Log:
use the IDGenerator api
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-05 19:03:13 UTC (rev 181)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-01-05 19:38:27 UTC (rev 182)
@@ -41,6 +41,7 @@
import org.apache.catalina.realm.GenericPrincipal;
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.factories.JBossSAMLAuthnResponseFactory;
import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLBaseFactory;
import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
@@ -162,7 +163,7 @@
}
//Create a response type
- String id = "ID_" + JBossSAMLBaseFactory.createUUID();
+ String id = IDGenerator.create("ID_");
IssuerInfoHolder issuerHolder = new IssuerInfoHolder(this.identityURL);
issuerHolder.setStatusCode(JBossSAMLURIConstants.STATUS_SUCCESS.get());
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-05 19:03:13 UTC (rev 181)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-01-05 19:38:27 UTC (rev 182)
@@ -41,8 +41,8 @@
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.log4j.Logger;
+import org.jboss.identity.federation.api.saml.v2.common.IDGenerator;
import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLAuthnRequestFactory;
-import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLBaseFactory;
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.api.util.Base64;
@@ -145,7 +145,7 @@
throw new ServletException("serviceURL is not configured");
AuthnRequestType authnRequest = JBossSAMLAuthnRequestFactory.createAuthnRequestType(
- "ID_" + JBossSAMLBaseFactory.createUUID(), serviceURL,
+ IDGenerator.create("ID_"), serviceURL,
identityURL, serviceURL);
SAML2Request saml2Request = new SAML2Request();
Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectValve.java
===================================================================
--- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectValve.java 2009-01-05 19:03:13 UTC (rev 181)
+++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectValve.java 2009-01-05 19:38:27 UTC (rev 182)
@@ -40,8 +40,8 @@
import org.apache.catalina.realm.GenericPrincipal;
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.factories.JBossSAMLAuthnRequestFactory;
-import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLBaseFactory;
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.api.util.Base64;
@@ -127,7 +127,7 @@
Principal idpPrincipal = this.createGenericPrincipal(request, userName, roles);
Session session = request.getSessionInternal(true);
- session.setNote(Constants.REQ_SSOID_NOTE, JBossSAMLBaseFactory.createUUID());
+ session.setNote(Constants.REQ_SSOID_NOTE, IDGenerator.create());
request.setUserPrincipal(idpPrincipal);
session.setPrincipal(idpPrincipal);
}
@@ -138,7 +138,7 @@
throw new ServletException("serviceURL is not configured");
AuthnRequestType authnRequest = JBossSAMLAuthnRequestFactory.createAuthnRequestType(
- "ID_" + JBossSAMLBaseFactory.createUUID(), serviceURL,
+ IDGenerator.create("ID_"), serviceURL,
identityURL, serviceURL);
SAML2Request saml2Request = new SAML2Request();
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-05 19:03:13 UTC (rev 181)
+++ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/XMLSignatureUtil.java 2009-01-05 19:38:27 UTC (rev 182)
@@ -72,9 +72,25 @@
private static ObjectFactory objectFactory = new ObjectFactory();
- private static XMLSignatureFactory fac = XMLSignatureFactory.getInstance("DOM",
- new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
+ private static XMLSignatureFactory fac = getXMLSignatureFactory();
+ private static XMLSignatureFactory getXMLSignatureFactory()
+ {
+ XMLSignatureFactory xsf = null;
+
+ try
+ {
+ xsf = XMLSignatureFactory.getInstance("DOM");
+ }
+ catch(Exception err)
+ {
+ //JDK5
+ xsf = XMLSignatureFactory.getInstance("DOM",
+ new org.jcp.xml.dsig.internal.dom.XMLDSigRI());
+ }
+ return xsf;
+ }
+
/**
* Sign an AuthnRequestType
* @param request
Modified: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java
===================================================================
--- identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java 2009-01-05 19:03:13 UTC (rev 181)
+++ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java 2009-01-05 19:38:27 UTC (rev 182)
@@ -26,8 +26,8 @@
import junit.framework.TestCase;
+import org.jboss.identity.federation.api.saml.v2.common.IDGenerator;
import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLAuthnRequestFactory;
-import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLBaseFactory;
import org.jboss.identity.federation.api.saml.v2.request.SAML2Request;
import org.jboss.identity.federation.api.util.Base64;
import org.jboss.identity.federation.api.util.DeflateUtil;
@@ -44,7 +44,7 @@
public void testDeflateEncoding() throws Exception
{
AuthnRequestType authnRequest = JBossSAMLAuthnRequestFactory.createAuthnRequestType(
- "ID_" + JBossSAMLBaseFactory.createUUID(), "http://sp",
+ IDGenerator.create("ID_"), "http://sp",
"http://localhost:8080/idp","http://sp");
StringWriter sw = new StringWriter();
Modified: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java
===================================================================
--- identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java 2009-01-05 19:03:13 UTC (rev 181)
+++ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java 2009-01-05 19:38:27 UTC (rev 182)
@@ -29,9 +29,9 @@
import javax.xml.crypto.dsig.DigestMethod;
import javax.xml.crypto.dsig.SignatureMethod;
+import org.jboss.identity.federation.api.saml.v2.common.IDGenerator;
import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLAuthnRequestFactory;
-import org.jboss.identity.federation.api.saml.v2.factories.JBossSAMLBaseFactory;
-import org.jboss.identity.federation.api.util.XMLSignatureUtil;
+import org.jboss.identity.federation.api.util.XMLSignatureUtil;
import org.jboss.identity.federation.core.saml.v2.util.SignatureUtil;
import org.jboss.identity.federation.saml.v2.protocol.AuthnRequestType;
import org.junit.Test;
@@ -54,7 +54,7 @@
public void testAuthnRequestCreationWithSignature() throws Exception
{
AuthnRequestType authnRequest = JBossSAMLAuthnRequestFactory.createAuthnRequestType(
- "ID_" + JBossSAMLBaseFactory.createUUID(), "http://sp", "http://idp", "http://sp");
+ IDGenerator.create("ID_"), "http://sp", "http://idp", "http://sp");
KeyPairGenerator kpg = KeyPairGenerator.getInstance("DSA");
KeyPair kp = kpg.genKeyPair();
Document signedDoc = XMLSignatureUtil.sign(authnRequest, kp.getPrivate(), null,
More information about the jboss-identity-commits
mailing list