[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Nov  6 17:50:23 2015
New Revision: 4398

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

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
    trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java?rev=4398&r1=4397&r2=4398&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/wssecurity/messaging/impl/WSSecuritySAML20AssertionTokenSecurityHandler.java	Fri Nov  6 17:50:23 2015
@@ -257,6 +257,8 @@
             SAML20AssertionValidator validator = resolveValidator(messageContext, assertion);
             if (validator == null) {
                 log.warn("No SAML20AssertionValidator was available, terminating");
+                SOAPMessagingSupport.registerSOAP11Fault(messageContext, FaultCode.SERVER, 
+                        "Internal processing error", null, null, null);
                 throw new MessageHandlerException("No SAML20AssertionValidator was available");
             }
         
@@ -332,6 +334,8 @@
                 break;
             default:
                 log.warn("Assertion validation result indicated an unknown value: {}", validationResult);
+                SOAPMessagingSupport.registerSOAP11Fault(messageContext, FaultCode.SERVER, 
+                        "Internal processing error", null, null, null);
                 throw new IllegalArgumentException("Assertion validation result indicated an unknown value: "
                         + validationResult);
         }
@@ -386,6 +390,8 @@
         
         if (validationContext == null) {
             log.warn("ValidationContext produced was null");
+            SOAPMessagingSupport.registerSOAP11Fault(messageContext, FaultCode.SERVER, 
+                    "Internal processing error", null, null, null);
             throw new MessageHandlerException("No ValidationContext was produced");
         }
         

Modified: trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java?rev=4398&r1=4397&r2=4398&view=diff
==============================================================================
--- trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java	(original)
+++ trunk/opensaml-soap-impl/src/main/java/org/opensaml/soap/wsaddressing/messaging/impl/ValidateActionHandler.java	Fri Nov  6 17:50:23 2015
@@ -32,6 +32,7 @@
 import org.opensaml.messaging.handler.MessageHandlerException;
 import org.opensaml.soap.messaging.SOAPMessagingSupport;
 import org.opensaml.soap.wsaddressing.Action;
+import org.opensaml.soap.wsaddressing.WSAddressingConstants;
 import org.opensaml.soap.wsaddressing.messaging.WSAddressingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -102,6 +103,9 @@
         } else {
             log.warn("Inbound WS-Addressing Action URI '{}' did not match the expected value '{}'", headerValue, 
                     getExpectedActionURI());
+            SOAPMessagingSupport.registerSOAP11Fault(messageContext, 
+                    WSAddressingConstants.SOAP_FAULT_ACTION_NOT_SUPPORTED,
+                    "Action URI not supported: " + headerValue, null, null, null);
             throw new MessageHandlerException("Inbound WS-Addressing Action URI did not match the expected value");
         }
     }