[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SamlMess...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri May 10 19:48:22 2013
New Revision: 3337

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3337&view=rev
Log:
Porting a couple more v2 SecurityPolicyRules to new MessageHandler API.
Get rid of corresponding IdP actions and tests replaced by these handlers. 

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SamlMessageInfoContext.java   (with props)
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageLifetimeSecurityHandler.java
      - copied, changed from r3336, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/IssueInstantRule.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageReplaySecurityHandler.java
      - copied, changed from r3336, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageReplayRule.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/MessageLifetimeSecurityHandlerTest.java
      - copied, changed from r3336, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/IssueInstantRuleTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/MessageReplaySecurityHandlerTest.java
      - copied, changed from r3336, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/MessageReplayRuleTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/messaging/context/SamlMessageInfoContextTest.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/IssueInstantRule.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageReplayRule.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/IssueInstantRuleTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/MessageReplayRuleTest.java

Copied: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageLifetimeSecurityHandler.java (from r3336, trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/IssueInstantRule.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageLifetimeSecurityHandler.java?p2=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageLifetimeSecurityHandler.java&p1=trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/IssueInstantRule.java&r1=3336&r2=3337&rev=3337&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/IssueInstantRule.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/common/binding/security/MessageLifetimeSecurityHandler.java Fri May 10 19:48:22 2013
@@ -17,46 +17,88 @@
 
 package org.opensaml.saml.common.binding.security;
 
+import net.shibboleth.utilities.java.support.component.UnmodifiableComponentException;
+
 import org.joda.time.DateTime;
-import org.opensaml.saml.common.binding.SAMLMessageContext;
-import org.opensaml.ws.message.MessageContext;
-import org.opensaml.ws.security.SecurityPolicyException;
-import org.opensaml.ws.security.SecurityPolicyRule;
+import org.opensaml.messaging.context.MessageContext;
+import org.opensaml.messaging.handler.AbstractMessageHandler;
+import org.opensaml.messaging.handler.MessageHandlerException;
+import org.opensaml.saml.common.SAMLObject;
+import org.opensaml.saml.common.messaging.context.SamlMessageInfoContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Security policy rule implementation that checks for validity of SAML message issue instant date and time.
+ * Security message handler implementation that checks for validity of SAML message issue instant date and time.
  */
-public class IssueInstantRule implements SecurityPolicyRule {
+public class MessageLifetimeSecurityHandler extends AbstractMessageHandler<SAMLObject> {
 
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(IssueInstantRule.class);
+    private final Logger log = LoggerFactory.getLogger(MessageLifetimeSecurityHandler.class);
 
     /**
      * Clock skew - the number of seconds before a lower time bound, or after an upper time bound, to consider still
-     * acceptable.
+     * acceptable Default value: 3 minutes.
      */
     private int clockSkew;
 
-    /** Number of seconds after a message issue instant after which the message is considered expired. */
-    private int expires;
+    /** Amount of time in seconds for which a message is valid after it is issued. Default value: 5 minutes */

[... 545 lines stripped ...]