[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/m...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Nov  6 17:50:43 2015
New Revision: 7962

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7962&view=rev
Log:
In SOAP message handlers, on exceptions register contextually-specific faults where appropriate.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessFrameworkHandler.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessFrameworkHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessFrameworkHandler.java?rev=7962&r1=7961&r2=7962&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessFrameworkHandler.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/messaging/impl/ProcessFrameworkHandler.java	Fri Nov  6 17:50:43 2015
@@ -22,16 +22,19 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import javax.xml.namespace.QName;
 
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
+import org.openliberty.xmltooling.Konstantz;
 import org.openliberty.xmltooling.soapbinding.Framework;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.messaging.handler.AbstractMessageHandler;
 import org.opensaml.messaging.handler.MessageHandlerException;
 import org.opensaml.soap.messaging.SOAPMessagingSupport;
+import org.opensaml.soap.wsaddressing.WSAddressingConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,6 +87,9 @@
         } else {
             log.warn("Inbound Liberty ID-WSF Framework version '{}' did not match the expected value '{}'", 
                     headerVersion, getExpectedVersion());
+            SOAPMessagingSupport.registerSOAP11Fault(messageContext, 
+                    new QName(Konstantz.SBF_NS, Konstantz.Status.FRAMEWORK_VERSION_MISMATCH.getCode()),
+                    "Framework version not supported: " + headerVersion, null, null, null);
             throw new MessageHandlerException("Inbound Liberty ID-WSF Framework version " 
                     + "did not match the expected value");
         }