Author: anil.saldhana(a)jboss.com
Date: 2009-06-03 10:36:05 -0400 (Wed, 03 Jun 2009)
New Revision: 567
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebRequestUtil.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnRequestFactory.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/XMLTimeUtil.java
Log:
correct exception contracts in API
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPRedirectValve.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -32,7 +32,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import javax.xml.bind.JAXBException;
-import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.catalina.Context;
import org.apache.catalina.Lifecycle;
@@ -348,14 +347,7 @@
assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(attrStatement);
//Add timed conditions
- try
- {
- saml2Response.createTimedConditions(assertion, this.assertionValidity);
- }
- catch (DatatypeConfigurationException e1)
- {
- throw new ConfigurationException(e1);
- }
+ saml2Response.createTimedConditions(assertion, this.assertionValidity);
//Lets see how the response looks like
if(log.isTraceEnabled())
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebRequestUtil.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebRequestUtil.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebRequestUtil.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -31,7 +31,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.xml.bind.JAXBException;
-import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.catalina.connector.Response;
import org.apache.log4j.Logger;
@@ -164,14 +163,7 @@
assertion.getStatementOrAuthnStatementOrAuthzDecisionStatement().add(attrStatement);
//Add timed conditions
- try
- {
- saml2Response.createTimedConditions(assertion, assertionValidity);
- }
- catch (DatatypeConfigurationException e)
- {
- throw new ConfigurationException(e);
- }
+ saml2Response.createTimedConditions(assertion, assertionValidity);
//Lets see how the response looks like
if(log.isTraceEnabled())
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -184,7 +184,7 @@
}
protected AuthnRequestType createSAMLRequestMessage(String relayState, Response
response)
- throws ServletException, DatatypeConfigurationException
+ throws ServletException, ConfigurationException
{
//create a saml request
if(this.serviceURL == null)
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -175,7 +175,7 @@
}
protected String createSAMLRequestMessage(String relayState, Response response)
- throws ServletException, DatatypeConfigurationException, SAXException, JAXBException,
IOException
+ throws ServletException, ConfigurationException, SAXException, JAXBException,
IOException
{
//create a saml request
if(this.serviceURL == null)
Modified:
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java
===================================================================
---
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/SPUtil.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -26,7 +26,6 @@
import java.util.List;
import javax.xml.bind.JAXBElement;
-import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.catalina.Context;
import org.apache.catalina.connector.Request;
@@ -57,10 +56,10 @@
* Create a SAML2 auth request
* @param serviceURL URL of the service
* @param identityURL URL of the identity provider
- * @return
- * @throws DatatypeConfigurationException
+ * @return
+ * @throws ConfigurationException
*/
- public AuthnRequestType createSAMLRequest(String serviceURL, String identityURL)
throws DatatypeConfigurationException
+ public AuthnRequestType createSAMLRequest(String serviceURL, String identityURL)
throws ConfigurationException
{
if(serviceURL == null)
throw new IllegalArgumentException("serviceURL is null");
@@ -77,13 +76,12 @@
* @param request entire request from IDP
* @param responseType ResponseType that has been generated
* @param serverEnvironment tomcat,jboss etc
- * @return
- * @throws DatatypeConfigurationException
+ * @return
* @throws AssertionExpiredException
*/
@SuppressWarnings("unchecked")
public Principal handleSAMLResponse(Request request, ResponseType responseType)
- throws DatatypeConfigurationException, ConfigurationException,
AssertionExpiredException
+ throws ConfigurationException, AssertionExpiredException
{
if(request == null)
throw new IllegalArgumentException("request is null");
Modified:
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -32,10 +32,10 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.parsers.ParserConfigurationException;
import org.jboss.identity.federation.core.constants.JBossIdentityFederationConstants;
+import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import
org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLAuthnRequestFactory;
import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory;
import org.jboss.identity.federation.core.saml.v2.util.DocumentUtil;
@@ -64,13 +64,13 @@
* @param assertionConsumerURL
* @param destination
* @param issuerValue
- * @return
- * @throws DatatypeConfigurationException
+ * @return
+ * @throws ConfigurationException
*/
public AuthnRequestType createAuthnRequestType(String id,
String assertionConsumerURL,
String destination,
- String issuerValue) throws DatatypeConfigurationException
+ String issuerValue) throws ConfigurationException
{
return JBossSAMLAuthnRequestFactory.createAuthnRequestType(
id, assertionConsumerURL, destination, issuerValue);
@@ -139,10 +139,10 @@
/**
* Create a Logout Request
* @param issuer
- * @return
- * @throws DatatypeConfigurationException
+ * @return
+ * @throws ConfigurationException
*/
- public LogoutRequestType createLogoutRequest(String issuer) throws
DatatypeConfigurationException
+ public LogoutRequestType createLogoutRequest(String issuer) throws
ConfigurationException
{
org.jboss.identity.federation.saml.v2.protocol.ObjectFactory of
= new org.jboss.identity.federation.saml.v2.protocol.ObjectFactory();
Modified:
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/SAML2Response.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -32,7 +32,6 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.parsers.ParserConfigurationException;
@@ -131,14 +130,7 @@
public ResponseType createResponseType(String ID, SPInfoHolder sp, IDPInfoHolder idp,
IssuerInfoHolder issuerInfo)
throws ConfigurationException
{
- try
- {
- return JBossSAMLAuthnResponseFactory.createResponseType(ID, sp, idp,
issuerInfo);
- }
- catch (DatatypeConfigurationException e)
- {
- throw new ConfigurationException(e);
- }
+ return JBossSAMLAuthnResponseFactory.createResponseType(ID, sp, idp, issuerInfo);
}
/**
@@ -161,24 +153,17 @@
public ResponseType createResponseType(String ID, IssuerInfoHolder issuerInfo,
AssertionType assertion)
throws ConfigurationException
{
- try
- {
- return JBossSAMLAuthnResponseFactory.createResponseType(ID, issuerInfo,
assertion);
- }
- catch (DatatypeConfigurationException e)
- {
- throw new ConfigurationException(e);
- }
+ return JBossSAMLAuthnResponseFactory.createResponseType(ID, issuerInfo,
assertion);
}
/**
* Add validity conditions to the SAML2 Assertion
* @param assertion
- * @param durationInMilis
- * @throws DatatypeConfigurationException
+ * @param durationInMilis
+ * @throws ConfigurationException
*/
public void createTimedConditions(AssertionType assertion, long durationInMilis)
- throws DatatypeConfigurationException
+ throws ConfigurationException
{
XMLGregorianCalendar issueInstant = assertion.getIssueInstant();
if(issueInstant == null)
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnRequestFactory.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnRequestFactory.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnRequestFactory.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -25,9 +25,9 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.XMLGregorianCalendar;
+import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
import org.jboss.identity.federation.core.saml.v2.util.XMLTimeUtil;
import org.jboss.identity.federation.core.util.JAXBUtil;
@@ -61,12 +61,12 @@
* @param assertionConsumerURL URL of the requestor where the response assertion is
requested
* @param issuerValue URL of the issuer
* @return
- * @throws DatatypeConfigurationException
+ * @throws ConfigurationException
*/
public static AuthnRequestType createAuthnRequestType(String id,
- String assertionConsumerURL, String destination, String issuerValue) throws
DatatypeConfigurationException
+ String assertionConsumerURL, String destination, String issuerValue) throws
ConfigurationException
{
- XMLGregorianCalendar issueInstant = XMLTimeUtil.getIssueInstant();
+ XMLGregorianCalendar issueInstant = XMLTimeUtil.getIssueInstant();
AuthnRequestType authnRequest =
SAMLProtocolFactory.getObjectFactory().createAuthnRequestType();
authnRequest.setID(id);
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -25,9 +25,9 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.XMLGregorianCalendar;
+import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.core.saml.v2.holders.IDPInfoHolder;
import org.jboss.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
import org.jboss.identity.federation.core.saml.v2.holders.SPInfoHolder;
@@ -84,10 +84,10 @@
* @param idp holder with the information on the Identity Provider
* @param issuerInfo holder with information on the issuer
* @return
- * @throws DatatypeConfigurationException
+ * @throws ConfigurationException
*/
- public static ResponseType createResponseType(String ID, SPInfoHolder sp,
IDPInfoHolder idp, IssuerInfoHolder issuerInfo)
- throws DatatypeConfigurationException
+ public static ResponseType createResponseType(String ID, SPInfoHolder sp,
IDPInfoHolder idp,
+ IssuerInfoHolder issuerInfo) throws ConfigurationException
{
String responseDestinationURI = sp.getResponseDestinationURI();
@@ -141,10 +141,10 @@
* @param issuerInfo
* @param assertionType
* @return
- * @throws DatatypeConfigurationException
+ * @throws ConfigurationException
*/
public static ResponseType createResponseType(String ID, IssuerInfoHolder issuerInfo,
AssertionType assertionType)
- throws DatatypeConfigurationException
+ throws ConfigurationException
{
ResponseType responseType =
SAMLProtocolFactory.getObjectFactory().createResponseType();
responseType.setVersion(issuerInfo.getSamlVersion());
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/AssertionUtil.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -21,8 +21,6 @@
*/
package org.jboss.identity.federation.core.saml.v2.util;
-import javax.xml.datatype.DatatypeConfigurationException;
-
import org.jboss.identity.federation.core.exceptions.ConfigurationException;
import org.jboss.identity.federation.saml.v2.assertion.AssertionType;
import org.jboss.identity.federation.saml.v2.assertion.ConditionsType;
@@ -46,15 +44,8 @@
ConditionsType conditionsType = assertion.getConditions();
if(conditionsType != null)
{
- try
- {
- return XMLTimeUtil.isValid(XMLTimeUtil.getIssueInstant(),
- conditionsType.getNotBefore(), conditionsType.getNotOnOrAfter());
- }
- catch (DatatypeConfigurationException e)
- {
- throw new ConfigurationException(e);
- }
+ return XMLTimeUtil.isValid(XMLTimeUtil.getIssueInstant(),
+ conditionsType.getNotBefore(), conditionsType.getNotOnOrAfter());
}
//TODO: if conditions do not exist, assume the assertion to be everlasting?
return true;
Modified:
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/XMLTimeUtil.java
===================================================================
---
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/XMLTimeUtil.java 2009-06-03
14:09:21 UTC (rev 566)
+++
identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/XMLTimeUtil.java 2009-06-03
14:36:05 UTC (rev 567)
@@ -30,6 +30,8 @@
import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
+import org.jboss.identity.federation.core.exceptions.ConfigurationException;
+
/**
* Util class dealing with xml based time
* @author Anil.Saldhana(a)redhat.com
@@ -41,15 +43,22 @@
* Add additional time in miliseconds
* @param value calendar whose value needs to be updated
* @param milis
- * @return calendar value with the addition
- * @throws DatatypeConfigurationException
+ * @return calendar value with the addition
+ * @throws ConfigurationException
*/
- public static XMLGregorianCalendar add(XMLGregorianCalendar value, long milis)
- throws DatatypeConfigurationException
+ public static XMLGregorianCalendar add(XMLGregorianCalendar value, long milis) throws
ConfigurationException
{
XMLGregorianCalendar newVal = (XMLGregorianCalendar) value.clone();
- Duration duration = DatatypeFactory.newInstance().newDuration(milis);
+ Duration duration;
+ try
+ {
+ duration = DatatypeFactory.newInstance().newDuration(milis);
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ throw new ConfigurationException(e);
+ }
newVal.add(duration);
return newVal;
}
@@ -59,13 +68,21 @@
* If the timezone is not valid, then the timezone falls back
* to "GMT"
* @param timezone
- * @return
- * @throws DatatypeConfigurationException
+ * @return
+ * @throws ConfigurationException
*/
- public static XMLGregorianCalendar getIssueInstant(String timezone) throws
DatatypeConfigurationException
+ public static XMLGregorianCalendar getIssueInstant(String timezone) throws
ConfigurationException
{
TimeZone tz = TimeZone.getTimeZone(timezone);
- DatatypeFactory dtf = DatatypeFactory.newInstance();
+ DatatypeFactory dtf;
+ try
+ {
+ dtf = DatatypeFactory.newInstance();
+ }
+ catch (DatatypeConfigurationException e)
+ {
+ throw new ConfigurationException(e);
+ }
GregorianCalendar gc = new GregorianCalendar(tz);
XMLGregorianCalendar xgc = dtf.newXMLGregorianCalendar(gc);
@@ -76,10 +93,10 @@
/**
* Get the current instant of time
* @return
- * @throws DatatypeConfigurationException
+ * @throws ConfigurationException
*/
- public static XMLGregorianCalendar getIssueInstant() throws
DatatypeConfigurationException
- {
+ public static XMLGregorianCalendar getIssueInstant() throws ConfigurationException
+ {
return getIssueInstant(TimeZone.getDefault().getID());
}