[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri May 24 13:58:57 2013
New Revision: 3342

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3342&view=rev
Log:
Adjust SAML received endpoint security handler to the injected request model.
Add some missing constraint and initialized checks. 

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageLifetimeSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageReplaySecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/ReceivedEndpointSecurityHandler.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityHandler.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/MessageReplaySecurityHandlerTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/ReceivedEndpointSecurityHandlerTest.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/messaging/impl/BaseClientCertAuthSecurityHandler.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java?rev=3342&r1=3341&r2=3342&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java Fri May 24 13:58:57 2013
@@ -268,19 +268,15 @@
      * Extract the transport endpoint URI at which this message was received.
      * 
      * @param messageContext current message context
-     * @param requestLookupStrategy the strategy used to look up the HttpServletRequest
+     * @param request the HttpServletRequest being evaluated
      * @return string representing the transport endpoint URI at which the current message was received
      * @throws MessageException thrown if the endpoint can not be looked up from the message
      *                              context and converted to a string representation
      */
     public static String getActualReceiverEndpointUri(@Nonnull final MessageContext<SAMLObject> messageContext, 
-            @Nonnull final ContextDataLookupFunction<MessageContext<?>, HttpServletRequest> requestLookupStrategy) 
+            @Nonnull final HttpServletRequest request) 
                     throws MessageException {
-        HttpServletRequest request = requestLookupStrategy.apply(messageContext);
-        if (request == null) {
-            throw new MessageException("HttpServletRequest could not be looked up from message context");
-        }
-        
+        Constraint.isNotNull(request, "HttpServletRequest may not be null");
         return request.getRequestURL().toString();
     }
 

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java?rev=3342&r1=3341&r2=3342&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/BaseSAMLSimpleSignatureSecurityHandler.java Fri May 24 13:58:57 2013
@@ -24,6 +24,7 @@
 
 import net.shibboleth.utilities.java.support.codec.Base64Support;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
 
@@ -83,7 +84,8 @@
      * @param engine engine used to validate the signature
      */
     public void setTrustEngine(SignatureTrustEngine engine) {
-        trustEngine = engine;
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
+        trustEngine = Constraint.isNotNull(engine, "TrustEngine may not be null");
     }
 
     /**
@@ -101,7 +103,8 @@
      * @param request The to set.
      */
     public void setHttpServletRequest(HttpServletRequest request) {
-        httpServletRequest = request;
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);

[... 335 lines stripped ...]