You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/11/18 12:34:10 UTC

svn commit: r1542988 [25/25] - in /webservices/website/wss4j: ./ apidocs/ apidocs/org/apache/ws/security/ apidocs/org/apache/ws/security/action/ apidocs/org/apache/ws/security/action/class-use/ apidocs/org/apache/ws/security/cache/ apidocs/org/apache/w...

Modified: webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/builder/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/builder/package-frame.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/builder/package-frame.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/builder/package-frame.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.saml.ext.builder</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.saml.ext.builder</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/builder/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/builder/package-summary.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/builder/package-summary.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/builder/package-summary.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.saml.ext.builder</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.saml.ext.builder</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/package-frame.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/package-frame.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/package-frame.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.saml.ext</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.saml.ext</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/package-summary.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/package-summary.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/saml/ext/package-summary.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.saml.ext</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.saml.ext</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/saml/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/saml/package-frame.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/saml/package-frame.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/saml/package-frame.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.saml</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.saml</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/saml/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/saml/package-summary.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/saml/package-summary.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/saml/package-summary.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.saml</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.saml</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/spnego/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/spnego/package-frame.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/spnego/package-frame.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/spnego/package-frame.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.spnego</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.spnego</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/spnego/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/spnego/package-summary.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/spnego/package-summary.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/spnego/package-summary.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.spnego</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.spnego</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/str/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/str/package-frame.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/str/package-frame.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/str/package-frame.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.str</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.str</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/str/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/str/package-summary.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/str/package-summary.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/str/package-summary.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.str</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.str</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/transform/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/transform/package-frame.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/transform/package-frame.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/transform/package-frame.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.transform</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.transform</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/transform/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/transform/package-summary.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/transform/package-summary.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/transform/package-summary.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.transform</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.transform</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/util/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/util/package-frame.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/util/package-frame.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/util/package-frame.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.util</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.util</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/util/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/util/package-summary.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/util/package-summary.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/util/package-summary.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.util</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.util</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/validate/SamlAssertionValidator.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/validate/SamlAssertionValidator.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/validate/SamlAssertionValidator.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/validate/SamlAssertionValidator.html Mon Nov 18 11:33:41 2013
@@ -29,201 +29,241 @@
 <a name="19" href="#19">19</a>  
 <a name="20" href="#20">20</a>  <strong class="jxr_keyword">package</strong> org.apache.ws.security.validate;
 <a name="21" href="#21">21</a>  
-<a name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> java.util.List;
-<a name="23" href="#23">23</a>  
-<a name="24" href="#24">24</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.WSSecurityException;
-<a name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.handler.RequestData;
-<a name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.saml.SAMLKeyInfo;
-<a name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.saml.ext.AssertionWrapper;
-<a name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.saml.ext.OpenSAMLUtil;
-<a name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> org.joda.time.DateTime;
-<a name="30" href="#30">30</a>  <strong class="jxr_keyword">import</strong> org.opensaml.common.SAMLVersion;
-<a name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> org.opensaml.xml.validation.ValidationException;
-<a name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> org.opensaml.xml.validation.ValidatorSuite;
-<a name="33" href="#33">33</a>  
-<a name="34" href="#34">34</a>  <em class="jxr_javadoccomment">/**</em>
-<a name="35" href="#35">35</a>  <em class="jxr_javadoccomment"> * This class validates a SAML Assertion, which is wrapped in an "AssertionWrapper" instance.</em>
-<a name="36" href="#36">36</a>  <em class="jxr_javadoccomment"> * It assumes that the AssertionWrapper instance has already verified the signature on the</em>
-<a name="37" href="#37">37</a>  <em class="jxr_javadoccomment"> * assertion (done by the SAMLTokenProcessor). It verifies trust in the signature, and also</em>
-<a name="38" href="#38">38</a>  <em class="jxr_javadoccomment"> * checks that the Subject contains a KeyInfo (and processes it) for the holder-of-key case,</em>
-<a name="39" href="#39">39</a>  <em class="jxr_javadoccomment"> * and verifies that the Assertion is signed as well for holder-of-key. </em>
-<a name="40" href="#40">40</a>  <em class="jxr_javadoccomment"> */</em>
-<a name="41" href="#41">41</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/ws/security/validate/SamlAssertionValidator.html">SamlAssertionValidator</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/ws/security/validate/SignatureTrustValidator.html">SignatureTrustValidator</a> {
-<a name="42" href="#42">42</a>      
-<a name="43" href="#43">43</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> org.apache.commons.logging.Log LOG = 
-<a name="44" href="#44">44</a>          org.apache.commons.logging.LogFactory.getLog(SamlAssertionValidator.<strong class="jxr_keyword">class</strong>);
-<a name="45" href="#45">45</a>      
-<a name="46" href="#46">46</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="47" href="#47">47</a>  <em class="jxr_javadoccomment">     * The time in seconds in the future within which the NotBefore time of an incoming </em>
-<a name="48" href="#48">48</a>  <em class="jxr_javadoccomment">     * Assertion is valid. The default is 60 seconds.</em>
-<a name="49" href="#49">49</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="50" href="#50">50</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> futureTTL = 60;
-<a name="51" href="#51">51</a>      
-<a name="52" href="#52">52</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="53" href="#53">53</a>  <em class="jxr_javadoccomment">     * Whether to validate the signature of the Assertion (if it exists) against the </em>
-<a name="54" href="#54">54</a>  <em class="jxr_javadoccomment">     * relevant profile. Default is true.</em>
-<a name="55" href="#55">55</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="56" href="#56">56</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> validateSignatureAgainstProfile = <strong class="jxr_keyword">true</strong>;
-<a name="57" href="#57">57</a>      
-<a name="58" href="#58">58</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="59" href="#59">59</a>  <em class="jxr_javadoccomment">     * Set the time in seconds in the future within which the NotBefore time of an incoming </em>
-<a name="60" href="#60">60</a>  <em class="jxr_javadoccomment">     * Assertion is valid. The default is 60 seconds.</em>
-<a name="61" href="#61">61</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="62" href="#62">62</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFutureTTL(<strong class="jxr_keyword">int</strong> newFutureTTL) {
-<a name="63" href="#63">63</a>          futureTTL = newFutureTTL;
-<a name="64" href="#64">64</a>      }
-<a name="65" href="#65">65</a>      
-<a name="66" href="#66">66</a>      <em class="jxr_javadoccomment">/**</em>
-<a name="67" href="#67">67</a>  <em class="jxr_javadoccomment">     * Validate the credential argument. It must contain a non-null AssertionWrapper. </em>
-<a name="68" href="#68">68</a>  <em class="jxr_javadoccomment">     * A Crypto and a CallbackHandler implementation is also required to be set.</em>
-<a name="69" href="#69">69</a>  <em class="jxr_javadoccomment">     * </em>
-<a name="70" href="#70">70</a>  <em class="jxr_javadoccomment">     * @param credential the Credential to be validated</em>
-<a name="71" href="#71">71</a>  <em class="jxr_javadoccomment">     * @param data the RequestData associated with the request</em>
-<a name="72" href="#72">72</a>  <em class="jxr_javadoccomment">     * @throws WSSecurityException on a failed validation</em>
-<a name="73" href="#73">73</a>  <em class="jxr_javadoccomment">     */</em>
-<a name="74" href="#74">74</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a> validate(<a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a> credential, <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="75" href="#75">75</a>          <strong class="jxr_keyword">if</strong> (credential == <strong class="jxr_keyword">null</strong> || credential.getAssertion() == <strong class="jxr_keyword">null</strong>) {
-<a name="76" href="#76">76</a>              <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"noCredential"</span>);
-<a name="77" href="#77">77</a>          }
-<a name="78" href="#78">78</a>          <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion = credential.getAssertion();
-<a name="79" href="#79">79</a>          
-<a name="80" href="#80">80</a>          <em class="jxr_comment">// Check HOK requirements</em>
-<a name="81" href="#81">81</a>          String confirmMethod = <strong class="jxr_keyword">null</strong>;
-<a name="82" href="#82">82</a>          List&lt;String&gt; methods = assertion.getConfirmationMethods();
-<a name="83" href="#83">83</a>          <strong class="jxr_keyword">if</strong> (methods != <strong class="jxr_keyword">null</strong> &amp;&amp; methods.size() &gt; 0) {
-<a name="84" href="#84">84</a>              confirmMethod = methods.get(0);
-<a name="85" href="#85">85</a>          }
-<a name="86" href="#86">86</a>          <strong class="jxr_keyword">if</strong> (OpenSAMLUtil.isMethodHolderOfKey(confirmMethod)) {
-<a name="87" href="#87">87</a>              <strong class="jxr_keyword">if</strong> (assertion.getSubjectKeyInfo() == <strong class="jxr_keyword">null</strong>) {
-<a name="88" href="#88">88</a>                  LOG.debug(<span class="jxr_string">"There is no Subject KeyInfo to match the holder-of-key subject conf method"</span>);
-<a name="89" href="#89">89</a>                  <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"noKeyInSAMLToken"</span>);
-<a name="90" href="#90">90</a>              }
-<a name="91" href="#91">91</a>              <em class="jxr_comment">// The assertion must have been signed for HOK</em>
-<a name="92" href="#92">92</a>              <strong class="jxr_keyword">if</strong> (!assertion.isSigned()) {
-<a name="93" href="#93">93</a>                  LOG.debug(<span class="jxr_string">"A holder-of-key assertion must be signed"</span>);
-<a name="94" href="#94">94</a>                  <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>);
-<a name="95" href="#95">95</a>              }
-<a name="96" href="#96">96</a>          }
-<a name="97" href="#97">97</a>          
-<a name="98" href="#98">98</a>          <em class="jxr_comment">// Check conditions</em>
-<a name="99" href="#99">99</a>          checkConditions(assertion);
-<a name="100" href="#100">100</a>         
-<a name="101" href="#101">101</a>         <em class="jxr_comment">// Validate the assertion against schemas/profiles</em>
-<a name="102" href="#102">102</a>         validateAssertion(assertion);
-<a name="103" href="#103">103</a> 
-<a name="104" href="#104">104</a>         <em class="jxr_comment">// Verify trust on the signature</em>
-<a name="105" href="#105">105</a>         <strong class="jxr_keyword">if</strong> (assertion.isSigned()) {
-<a name="106" href="#106">106</a>             verifySignedAssertion(assertion, data);
-<a name="107" href="#107">107</a>         }
-<a name="108" href="#108">108</a>         <strong class="jxr_keyword">return</strong> credential;
-<a name="109" href="#109">109</a>     }
-<a name="110" href="#110">110</a>     
-<a name="111" href="#111">111</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="112" href="#112">112</a> <em class="jxr_javadoccomment">     * Verify trust in the signature of a signed Assertion. This method is separate so that</em>
-<a name="113" href="#113">113</a> <em class="jxr_javadoccomment">     * the user can override if if they want.</em>
-<a name="114" href="#114">114</a> <em class="jxr_javadoccomment">     * @param assertion The signed Assertion</em>
-<a name="115" href="#115">115</a> <em class="jxr_javadoccomment">     * @param data The RequestData context</em>
-<a name="116" href="#116">116</a> <em class="jxr_javadoccomment">     * @return A Credential instance</em>
-<a name="117" href="#117">117</a> <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
-<a name="118" href="#118">118</a> <em class="jxr_javadoccomment">     */</em>
-<a name="119" href="#119">119</a>     <strong class="jxr_keyword">protected</strong> <a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a> verifySignedAssertion(
-<a name="120" href="#120">120</a>         <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion,
-<a name="121" href="#121">121</a>         <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data
-<a name="122" href="#122">122</a>     ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="123" href="#123">123</a>         <a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a> trustCredential = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>();
-<a name="124" href="#124">124</a>         <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> samlKeyInfo = assertion.getSignatureKeyInfo();
-<a name="125" href="#125">125</a>         trustCredential.setPublicKey(samlKeyInfo.getPublicKey());
-<a name="126" href="#126">126</a>         trustCredential.setCertificates(samlKeyInfo.getCerts());
-<a name="127" href="#127">127</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">super</strong>.validate(trustCredential, data);
-<a name="128" href="#128">128</a>     }
-<a name="129" href="#129">129</a>     
-<a name="130" href="#130">130</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="131" href="#131">131</a> <em class="jxr_javadoccomment">     * Check the Conditions of the Assertion.</em>
-<a name="132" href="#132">132</a> <em class="jxr_javadoccomment">     */</em>
-<a name="133" href="#133">133</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> checkConditions(<a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="134" href="#134">134</a>         DateTime validFrom = <strong class="jxr_keyword">null</strong>;
-<a name="135" href="#135">135</a>         DateTime validTill = <strong class="jxr_keyword">null</strong>;
-<a name="136" href="#136">136</a>         <strong class="jxr_keyword">if</strong> (assertion.getSamlVersion().equals(SAMLVersion.VERSION_20)
-<a name="137" href="#137">137</a>             &amp;&amp; assertion.getSaml2().getConditions() != <strong class="jxr_keyword">null</strong>) {
-<a name="138" href="#138">138</a>             validFrom = assertion.getSaml2().getConditions().getNotBefore();
-<a name="139" href="#139">139</a>             validTill = assertion.getSaml2().getConditions().getNotOnOrAfter();
-<a name="140" href="#140">140</a>         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (assertion.getSamlVersion().equals(SAMLVersion.VERSION_11)
-<a name="141" href="#141">141</a>             &amp;&amp; assertion.getSaml1().getConditions() != <strong class="jxr_keyword">null</strong>) {
-<a name="142" href="#142">142</a>             validFrom = assertion.getSaml1().getConditions().getNotBefore();
-<a name="143" href="#143">143</a>             validTill = assertion.getSaml1().getConditions().getNotOnOrAfter();
-<a name="144" href="#144">144</a>         }
-<a name="145" href="#145">145</a>         
-<a name="146" href="#146">146</a>         <strong class="jxr_keyword">if</strong> (validFrom != <strong class="jxr_keyword">null</strong>) {
-<a name="147" href="#147">147</a>             DateTime currentTime = <strong class="jxr_keyword">new</strong> DateTime();
-<a name="148" href="#148">148</a>             currentTime = currentTime.plusSeconds(futureTTL);
-<a name="149" href="#149">149</a>             <strong class="jxr_keyword">if</strong> (validFrom.isAfter(currentTime)) {
-<a name="150" href="#150">150</a>                 LOG.debug(<span class="jxr_string">"SAML Token condition (Not Before) not met"</span>);
-<a name="151" href="#151">151</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>);
-<a name="152" href="#152">152</a>             }
-<a name="153" href="#153">153</a>         }
-<a name="154" href="#154">154</a> 
-<a name="155" href="#155">155</a>         <strong class="jxr_keyword">if</strong> (validTill != <strong class="jxr_keyword">null</strong> &amp;&amp; validTill.isBeforeNow()) {
-<a name="156" href="#156">156</a>             LOG.debug(<span class="jxr_string">"SAML Token condition (Not On Or After) not met"</span>);
-<a name="157" href="#157">157</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>);
+<a name="22" href="#22">22</a>  <strong class="jxr_keyword">import</strong> java.util.Date;
+<a name="23" href="#23">23</a>  <strong class="jxr_keyword">import</strong> java.util.List;
+<a name="24" href="#24">24</a>  
+<a name="25" href="#25">25</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.WSSecurityException;
+<a name="26" href="#26">26</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.cache.ReplayCache;
+<a name="27" href="#27">27</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.handler.RequestData;
+<a name="28" href="#28">28</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.saml.SAMLKeyInfo;
+<a name="29" href="#29">29</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.saml.ext.AssertionWrapper;
+<a name="30" href="#30">30</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.saml.ext.OpenSAMLUtil;
+<a name="31" href="#31">31</a>  <strong class="jxr_keyword">import</strong> org.joda.time.DateTime;
+<a name="32" href="#32">32</a>  <strong class="jxr_keyword">import</strong> org.opensaml.common.SAMLVersion;
+<a name="33" href="#33">33</a>  <strong class="jxr_keyword">import</strong> org.opensaml.xml.validation.ValidationException;
+<a name="34" href="#34">34</a>  <strong class="jxr_keyword">import</strong> org.opensaml.xml.validation.ValidatorSuite;
+<a name="35" href="#35">35</a>  
+<a name="36" href="#36">36</a>  <em class="jxr_javadoccomment">/**</em>
+<a name="37" href="#37">37</a>  <em class="jxr_javadoccomment"> * This class validates a SAML Assertion, which is wrapped in an "AssertionWrapper" instance.</em>
+<a name="38" href="#38">38</a>  <em class="jxr_javadoccomment"> * It assumes that the AssertionWrapper instance has already verified the signature on the</em>
+<a name="39" href="#39">39</a>  <em class="jxr_javadoccomment"> * assertion (done by the SAMLTokenProcessor). It verifies trust in the signature, and also</em>
+<a name="40" href="#40">40</a>  <em class="jxr_javadoccomment"> * checks that the Subject contains a KeyInfo (and processes it) for the holder-of-key case,</em>
+<a name="41" href="#41">41</a>  <em class="jxr_javadoccomment"> * and verifies that the Assertion is signed as well for holder-of-key. </em>
+<a name="42" href="#42">42</a>  <em class="jxr_javadoccomment"> */</em>
+<a name="43" href="#43">43</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../org/apache/ws/security/validate/SamlAssertionValidator.html">SamlAssertionValidator</a> <strong class="jxr_keyword">extends</strong> <a href="../../../../../org/apache/ws/security/validate/SignatureTrustValidator.html">SignatureTrustValidator</a> {
+<a name="44" href="#44">44</a>      
+<a name="45" href="#45">45</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> org.apache.commons.logging.Log LOG = 
+<a name="46" href="#46">46</a>          org.apache.commons.logging.LogFactory.getLog(SamlAssertionValidator.<strong class="jxr_keyword">class</strong>);
+<a name="47" href="#47">47</a>      
+<a name="48" href="#48">48</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="49" href="#49">49</a>  <em class="jxr_javadoccomment">     * The time in seconds in the future within which the NotBefore time of an incoming </em>
+<a name="50" href="#50">50</a>  <em class="jxr_javadoccomment">     * Assertion is valid. The default is 60 seconds.</em>
+<a name="51" href="#51">51</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="52" href="#52">52</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">int</strong> futureTTL = 60;
+<a name="53" href="#53">53</a>      
+<a name="54" href="#54">54</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="55" href="#55">55</a>  <em class="jxr_javadoccomment">     * Whether to validate the signature of the Assertion (if it exists) against the </em>
+<a name="56" href="#56">56</a>  <em class="jxr_javadoccomment">     * relevant profile. Default is true.</em>
+<a name="57" href="#57">57</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="58" href="#58">58</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">boolean</strong> validateSignatureAgainstProfile = <strong class="jxr_keyword">true</strong>;
+<a name="59" href="#59">59</a>      
+<a name="60" href="#60">60</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="61" href="#61">61</a>  <em class="jxr_javadoccomment">     * Set the time in seconds in the future within which the NotBefore time of an incoming </em>
+<a name="62" href="#62">62</a>  <em class="jxr_javadoccomment">     * Assertion is valid. The default is 60 seconds.</em>
+<a name="63" href="#63">63</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="64" href="#64">64</a>      <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setFutureTTL(<strong class="jxr_keyword">int</strong> newFutureTTL) {
+<a name="65" href="#65">65</a>          futureTTL = newFutureTTL;
+<a name="66" href="#66">66</a>      }
+<a name="67" href="#67">67</a>      
+<a name="68" href="#68">68</a>      <em class="jxr_javadoccomment">/**</em>
+<a name="69" href="#69">69</a>  <em class="jxr_javadoccomment">     * Validate the credential argument. It must contain a non-null AssertionWrapper. </em>
+<a name="70" href="#70">70</a>  <em class="jxr_javadoccomment">     * A Crypto and a CallbackHandler implementation is also required to be set.</em>
+<a name="71" href="#71">71</a>  <em class="jxr_javadoccomment">     * </em>
+<a name="72" href="#72">72</a>  <em class="jxr_javadoccomment">     * @param credential the Credential to be validated</em>
+<a name="73" href="#73">73</a>  <em class="jxr_javadoccomment">     * @param data the RequestData associated with the request</em>
+<a name="74" href="#74">74</a>  <em class="jxr_javadoccomment">     * @throws WSSecurityException on a failed validation</em>
+<a name="75" href="#75">75</a>  <em class="jxr_javadoccomment">     */</em>
+<a name="76" href="#76">76</a>      <strong class="jxr_keyword">public</strong> <a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a> validate(<a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a> credential, <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="77" href="#77">77</a>          <strong class="jxr_keyword">if</strong> (credential == <strong class="jxr_keyword">null</strong> || credential.getAssertion() == <strong class="jxr_keyword">null</strong>) {
+<a name="78" href="#78">78</a>              <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"noCredential"</span>);
+<a name="79" href="#79">79</a>          }
+<a name="80" href="#80">80</a>          <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion = credential.getAssertion();
+<a name="81" href="#81">81</a>          
+<a name="82" href="#82">82</a>          <em class="jxr_comment">// Check HOK requirements</em>
+<a name="83" href="#83">83</a>          String confirmMethod = <strong class="jxr_keyword">null</strong>;
+<a name="84" href="#84">84</a>          List&lt;String&gt; methods = assertion.getConfirmationMethods();
+<a name="85" href="#85">85</a>          <strong class="jxr_keyword">if</strong> (methods != <strong class="jxr_keyword">null</strong> &amp;&amp; methods.size() &gt; 0) {
+<a name="86" href="#86">86</a>              confirmMethod = methods.get(0);
+<a name="87" href="#87">87</a>          }
+<a name="88" href="#88">88</a>          <strong class="jxr_keyword">if</strong> (OpenSAMLUtil.isMethodHolderOfKey(confirmMethod)) {
+<a name="89" href="#89">89</a>              <strong class="jxr_keyword">if</strong> (assertion.getSubjectKeyInfo() == <strong class="jxr_keyword">null</strong>) {
+<a name="90" href="#90">90</a>                  LOG.debug(<span class="jxr_string">"There is no Subject KeyInfo to match the holder-of-key subject conf method"</span>);
+<a name="91" href="#91">91</a>                  <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"noKeyInSAMLToken"</span>);
+<a name="92" href="#92">92</a>              }
+<a name="93" href="#93">93</a>              <em class="jxr_comment">// The assertion must have been signed for HOK</em>
+<a name="94" href="#94">94</a>              <strong class="jxr_keyword">if</strong> (!assertion.isSigned()) {
+<a name="95" href="#95">95</a>                  LOG.debug(<span class="jxr_string">"A holder-of-key assertion must be signed"</span>);
+<a name="96" href="#96">96</a>                  <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>);
+<a name="97" href="#97">97</a>              }
+<a name="98" href="#98">98</a>          }
+<a name="99" href="#99">99</a>          
+<a name="100" href="#100">100</a>         <em class="jxr_comment">// Check conditions</em>
+<a name="101" href="#101">101</a>         checkConditions(assertion);
+<a name="102" href="#102">102</a> 
+<a name="103" href="#103">103</a>         <em class="jxr_comment">// Check OneTimeUse Condition</em>
+<a name="104" href="#104">104</a>         checkOneTimeUse(assertion, data);
+<a name="105" href="#105">105</a>         
+<a name="106" href="#106">106</a>         <em class="jxr_comment">// Validate the assertion against schemas/profiles</em>
+<a name="107" href="#107">107</a>         validateAssertion(assertion);
+<a name="108" href="#108">108</a> 
+<a name="109" href="#109">109</a>         <em class="jxr_comment">// Verify trust on the signature</em>
+<a name="110" href="#110">110</a>         <strong class="jxr_keyword">if</strong> (assertion.isSigned()) {
+<a name="111" href="#111">111</a>             verifySignedAssertion(assertion, data);
+<a name="112" href="#112">112</a>         }
+<a name="113" href="#113">113</a>         <strong class="jxr_keyword">return</strong> credential;
+<a name="114" href="#114">114</a>     }
+<a name="115" href="#115">115</a>     
+<a name="116" href="#116">116</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="117" href="#117">117</a> <em class="jxr_javadoccomment">     * Verify trust in the signature of a signed Assertion. This method is separate so that</em>
+<a name="118" href="#118">118</a> <em class="jxr_javadoccomment">     * the user can override if if they want.</em>
+<a name="119" href="#119">119</a> <em class="jxr_javadoccomment">     * @param assertion The signed Assertion</em>
+<a name="120" href="#120">120</a> <em class="jxr_javadoccomment">     * @param data The RequestData context</em>
+<a name="121" href="#121">121</a> <em class="jxr_javadoccomment">     * @return A Credential instance</em>
+<a name="122" href="#122">122</a> <em class="jxr_javadoccomment">     * @throws WSSecurityException</em>
+<a name="123" href="#123">123</a> <em class="jxr_javadoccomment">     */</em>
+<a name="124" href="#124">124</a>     <strong class="jxr_keyword">protected</strong> <a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a> verifySignedAssertion(
+<a name="125" href="#125">125</a>         <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion,
+<a name="126" href="#126">126</a>         <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data
+<a name="127" href="#127">127</a>     ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="128" href="#128">128</a>         <a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a> trustCredential = <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/validate/Credential.html">Credential</a>();
+<a name="129" href="#129">129</a>         <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> samlKeyInfo = assertion.getSignatureKeyInfo();
+<a name="130" href="#130">130</a>         trustCredential.setPublicKey(samlKeyInfo.getPublicKey());
+<a name="131" href="#131">131</a>         trustCredential.setCertificates(samlKeyInfo.getCerts());
+<a name="132" href="#132">132</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">super</strong>.validate(trustCredential, data);
+<a name="133" href="#133">133</a>     }
+<a name="134" href="#134">134</a>     
+<a name="135" href="#135">135</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="136" href="#136">136</a> <em class="jxr_javadoccomment">     * Check the Conditions of the Assertion.</em>
+<a name="137" href="#137">137</a> <em class="jxr_javadoccomment">     */</em>
+<a name="138" href="#138">138</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> checkConditions(<a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="139" href="#139">139</a>         DateTime validFrom = <strong class="jxr_keyword">null</strong>;
+<a name="140" href="#140">140</a>         DateTime validTill = <strong class="jxr_keyword">null</strong>;
+<a name="141" href="#141">141</a>         <strong class="jxr_keyword">if</strong> (assertion.getSamlVersion().equals(SAMLVersion.VERSION_20)
+<a name="142" href="#142">142</a>             &amp;&amp; assertion.getSaml2().getConditions() != <strong class="jxr_keyword">null</strong>) {
+<a name="143" href="#143">143</a>             validFrom = assertion.getSaml2().getConditions().getNotBefore();
+<a name="144" href="#144">144</a>             validTill = assertion.getSaml2().getConditions().getNotOnOrAfter();
+<a name="145" href="#145">145</a>         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (assertion.getSamlVersion().equals(SAMLVersion.VERSION_11)
+<a name="146" href="#146">146</a>             &amp;&amp; assertion.getSaml1().getConditions() != <strong class="jxr_keyword">null</strong>) {
+<a name="147" href="#147">147</a>             validFrom = assertion.getSaml1().getConditions().getNotBefore();
+<a name="148" href="#148">148</a>             validTill = assertion.getSaml1().getConditions().getNotOnOrAfter();
+<a name="149" href="#149">149</a>         }
+<a name="150" href="#150">150</a>         
+<a name="151" href="#151">151</a>         <strong class="jxr_keyword">if</strong> (validFrom != <strong class="jxr_keyword">null</strong>) {
+<a name="152" href="#152">152</a>             DateTime currentTime = <strong class="jxr_keyword">new</strong> DateTime();
+<a name="153" href="#153">153</a>             currentTime = currentTime.plusSeconds(futureTTL);
+<a name="154" href="#154">154</a>             <strong class="jxr_keyword">if</strong> (validFrom.isAfter(currentTime)) {
+<a name="155" href="#155">155</a>                 LOG.debug(<span class="jxr_string">"SAML Token condition (Not Before) not met"</span>);
+<a name="156" href="#156">156</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>);
+<a name="157" href="#157">157</a>             }
 <a name="158" href="#158">158</a>         }
-<a name="159" href="#159">159</a>     }
-<a name="160" href="#160">160</a>     
-<a name="161" href="#161">161</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="162" href="#162">162</a> <em class="jxr_javadoccomment">     * Validate the assertion against schemas/profiles</em>
-<a name="163" href="#163">163</a> <em class="jxr_javadoccomment">     */</em>
-<a name="164" href="#164">164</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> validateAssertion(<a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion) <strong class="jxr_keyword">throws</strong> WSSecurityException {
-<a name="165" href="#165">165</a>         <strong class="jxr_keyword">if</strong> (validateSignatureAgainstProfile) {
-<a name="166" href="#166">166</a>             assertion.validateSignatureAgainstProfile();
-<a name="167" href="#167">167</a>         }
-<a name="168" href="#168">168</a>         
-<a name="169" href="#169">169</a>         <strong class="jxr_keyword">if</strong> (assertion.getSaml1() != <strong class="jxr_keyword">null</strong>) {
-<a name="170" href="#170">170</a>             ValidatorSuite schemaValidators = 
-<a name="171" href="#171">171</a>                 org.opensaml.Configuration.getValidatorSuite(<span class="jxr_string">"saml1-schema-validator"</span>);
-<a name="172" href="#172">172</a>             ValidatorSuite specValidators = 
-<a name="173" href="#173">173</a>                 org.opensaml.Configuration.getValidatorSuite(<span class="jxr_string">"saml1-spec-validator"</span>);
-<a name="174" href="#174">174</a>             <strong class="jxr_keyword">try</strong> {
-<a name="175" href="#175">175</a>                 schemaValidators.validate(assertion.getSaml1());
-<a name="176" href="#176">176</a>                 specValidators.validate(assertion.getSaml1());
-<a name="177" href="#177">177</a>             } <strong class="jxr_keyword">catch</strong> (ValidationException e) {
-<a name="178" href="#178">178</a>                 LOG.debug(<span class="jxr_string">"Saml Validation error: "</span> + e.getMessage(), e);
-<a name="179" href="#179">179</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="180" href="#180">180</a>                     WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>, <strong class="jxr_keyword">null</strong>, e
-<a name="181" href="#181">181</a>                 );
-<a name="182" href="#182">182</a>             }
-<a name="183" href="#183">183</a>         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (assertion.getSaml2() != <strong class="jxr_keyword">null</strong>) {
-<a name="184" href="#184">184</a>             ValidatorSuite schemaValidators = 
-<a name="185" href="#185">185</a>                 org.opensaml.Configuration.getValidatorSuite(<span class="jxr_string">"saml2-core-schema-validator"</span>);
-<a name="186" href="#186">186</a>             ValidatorSuite specValidators = 
-<a name="187" href="#187">187</a>                 org.opensaml.Configuration.getValidatorSuite(<span class="jxr_string">"saml2-core-spec-validator"</span>);
-<a name="188" href="#188">188</a>             <strong class="jxr_keyword">try</strong> {
-<a name="189" href="#189">189</a>                 schemaValidators.validate(assertion.getSaml2());
-<a name="190" href="#190">190</a>                 specValidators.validate(assertion.getSaml2());
-<a name="191" href="#191">191</a>             } <strong class="jxr_keyword">catch</strong> (ValidationException e) {
-<a name="192" href="#192">192</a>                 LOG.debug(<span class="jxr_string">"Saml Validation error: "</span> + e.getMessage(), e);
-<a name="193" href="#193">193</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
-<a name="194" href="#194">194</a>                     WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>, <strong class="jxr_keyword">null</strong>, e
-<a name="195" href="#195">195</a>                 );
-<a name="196" href="#196">196</a>             }
-<a name="197" href="#197">197</a>         }
-<a name="198" href="#198">198</a>     }
-<a name="199" href="#199">199</a> 
-<a name="200" href="#200">200</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="201" href="#201">201</a> <em class="jxr_javadoccomment">     * Whether to validate the signature of the Assertion (if it exists) against the </em>
-<a name="202" href="#202">202</a> <em class="jxr_javadoccomment">     * relevant profile. Default is true.</em>
+<a name="159" href="#159">159</a> 
+<a name="160" href="#160">160</a>         <strong class="jxr_keyword">if</strong> (validTill != <strong class="jxr_keyword">null</strong> &amp;&amp; validTill.isBeforeNow()) {
+<a name="161" href="#161">161</a>             LOG.debug(<span class="jxr_string">"SAML Token condition (Not On Or After) not met"</span>);
+<a name="162" href="#162">162</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>);
+<a name="163" href="#163">163</a>         }
+<a name="164" href="#164">164</a>     }
+<a name="165" href="#165">165</a> 
+<a name="166" href="#166">166</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="167" href="#167">167</a> <em class="jxr_javadoccomment">     * Check the "OneTimeUse" Condition of the Assertion. If this is set then the Assertion</em>
+<a name="168" href="#168">168</a> <em class="jxr_javadoccomment">     * is cached (if a cache is defined), and must not have been previously cached</em>
+<a name="169" href="#169">169</a> <em class="jxr_javadoccomment">     */</em>
+<a name="170" href="#170">170</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> checkOneTimeUse(
+<a name="171" href="#171">171</a>         <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> samlAssertion, <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data
+<a name="172" href="#172">172</a>     ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="173" href="#173">173</a>         <strong class="jxr_keyword">if</strong> (samlAssertion.getSamlVersion().equals(SAMLVersion.VERSION_20)
+<a name="174" href="#174">174</a>             &amp;&amp; samlAssertion.getSaml2().getConditions() != <strong class="jxr_keyword">null</strong>
+<a name="175" href="#175">175</a>             &amp;&amp; samlAssertion.getSaml2().getConditions().getOneTimeUse() != <strong class="jxr_keyword">null</strong> 
+<a name="176" href="#176">176</a>             &amp;&amp; data.getSamlOneTimeUseReplayCache() != <strong class="jxr_keyword">null</strong>) {
+<a name="177" href="#177">177</a>             String identifier = samlAssertion.getId();
+<a name="178" href="#178">178</a> 
+<a name="179" href="#179">179</a>             <a href="../../../../../org/apache/ws/security/cache/ReplayCache.html">ReplayCache</a> replayCache = data.getSamlOneTimeUseReplayCache();
+<a name="180" href="#180">180</a>             <strong class="jxr_keyword">if</strong> (replayCache.contains(identifier)) {
+<a name="181" href="#181">181</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="182" href="#182">182</a>                     WSSecurityException.INVALID_SECURITY,
+<a name="183" href="#183">183</a>                     <span class="jxr_string">"badSamlToken"</span>,
+<a name="184" href="#184">184</a>                     <strong class="jxr_keyword">new</strong> Object[] {<span class="jxr_string">"A replay attack has been detected"</span>});
+<a name="185" href="#185">185</a>             }
+<a name="186" href="#186">186</a> 
+<a name="187" href="#187">187</a>             DateTime expires = samlAssertion.getSaml2().getConditions().getNotOnOrAfter();
+<a name="188" href="#188">188</a>             <strong class="jxr_keyword">if</strong> (expires != <strong class="jxr_keyword">null</strong>) {
+<a name="189" href="#189">189</a>                 Date rightNow = <strong class="jxr_keyword">new</strong> Date();
+<a name="190" href="#190">190</a>                 <strong class="jxr_keyword">long</strong> currentTime = rightNow.getTime();
+<a name="191" href="#191">191</a>                 <strong class="jxr_keyword">long</strong> expiresTime = expires.getMillis();
+<a name="192" href="#192">192</a>                 replayCache.add(identifier, 1L + (expiresTime - currentTime) / 1000L);
+<a name="193" href="#193">193</a>             } <strong class="jxr_keyword">else</strong> {
+<a name="194" href="#194">194</a>                 replayCache.add(identifier);
+<a name="195" href="#195">195</a>             }
+<a name="196" href="#196">196</a> 
+<a name="197" href="#197">197</a>             replayCache.add(identifier);
+<a name="198" href="#198">198</a>         }
+<a name="199" href="#199">199</a>     }
+<a name="200" href="#200">200</a> 
+<a name="201" href="#201">201</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="202" href="#202">202</a> <em class="jxr_javadoccomment">     * Validate the assertion against schemas/profiles</em>
 <a name="203" href="#203">203</a> <em class="jxr_javadoccomment">     */</em>
-<a name="204" href="#204">204</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isValidateSignatureAgainstProfile() {
-<a name="205" href="#205">205</a>         <strong class="jxr_keyword">return</strong> validateSignatureAgainstProfile;
-<a name="206" href="#206">206</a>     }
-<a name="207" href="#207">207</a> 
-<a name="208" href="#208">208</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="209" href="#209">209</a> <em class="jxr_javadoccomment">     * Whether to validate the signature of the Assertion (if it exists) against the </em>
-<a name="210" href="#210">210</a> <em class="jxr_javadoccomment">     * relevant profile. Default is true.</em>
-<a name="211" href="#211">211</a> <em class="jxr_javadoccomment">     */</em>
-<a name="212" href="#212">212</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setValidateSignatureAgainstProfile(<strong class="jxr_keyword">boolean</strong> validateSignatureAgainstProfile) {
-<a name="213" href="#213">213</a>         <strong class="jxr_keyword">this</strong>.validateSignatureAgainstProfile = validateSignatureAgainstProfile;
-<a name="214" href="#214">214</a>     }
-<a name="215" href="#215">215</a>     
-<a name="216" href="#216">216</a> }
+<a name="204" href="#204">204</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> validateAssertion(<a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion) <strong class="jxr_keyword">throws</strong> WSSecurityException {
+<a name="205" href="#205">205</a>         <strong class="jxr_keyword">if</strong> (validateSignatureAgainstProfile) {
+<a name="206" href="#206">206</a>             assertion.validateSignatureAgainstProfile();
+<a name="207" href="#207">207</a>         }
+<a name="208" href="#208">208</a>         
+<a name="209" href="#209">209</a>         <strong class="jxr_keyword">if</strong> (assertion.getSaml1() != <strong class="jxr_keyword">null</strong>) {
+<a name="210" href="#210">210</a>             ValidatorSuite schemaValidators = 
+<a name="211" href="#211">211</a>                 org.opensaml.Configuration.getValidatorSuite(<span class="jxr_string">"saml1-schema-validator"</span>);
+<a name="212" href="#212">212</a>             ValidatorSuite specValidators = 
+<a name="213" href="#213">213</a>                 org.opensaml.Configuration.getValidatorSuite(<span class="jxr_string">"saml1-spec-validator"</span>);
+<a name="214" href="#214">214</a>             <strong class="jxr_keyword">try</strong> {
+<a name="215" href="#215">215</a>                 schemaValidators.validate(assertion.getSaml1());
+<a name="216" href="#216">216</a>                 specValidators.validate(assertion.getSaml1());
+<a name="217" href="#217">217</a>             } <strong class="jxr_keyword">catch</strong> (ValidationException e) {
+<a name="218" href="#218">218</a>                 LOG.debug(<span class="jxr_string">"Saml Validation error: "</span> + e.getMessage(), e);
+<a name="219" href="#219">219</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="220" href="#220">220</a>                     WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>, <strong class="jxr_keyword">null</strong>, e
+<a name="221" href="#221">221</a>                 );
+<a name="222" href="#222">222</a>             }
+<a name="223" href="#223">223</a>         } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (assertion.getSaml2() != <strong class="jxr_keyword">null</strong>) {
+<a name="224" href="#224">224</a>             ValidatorSuite schemaValidators = 
+<a name="225" href="#225">225</a>                 org.opensaml.Configuration.getValidatorSuite(<span class="jxr_string">"saml2-core-schema-validator"</span>);
+<a name="226" href="#226">226</a>             ValidatorSuite specValidators = 
+<a name="227" href="#227">227</a>                 org.opensaml.Configuration.getValidatorSuite(<span class="jxr_string">"saml2-core-spec-validator"</span>);
+<a name="228" href="#228">228</a>             <strong class="jxr_keyword">try</strong> {
+<a name="229" href="#229">229</a>                 schemaValidators.validate(assertion.getSaml2());
+<a name="230" href="#230">230</a>                 specValidators.validate(assertion.getSaml2());
+<a name="231" href="#231">231</a>             } <strong class="jxr_keyword">catch</strong> (ValidationException e) {
+<a name="232" href="#232">232</a>                 LOG.debug(<span class="jxr_string">"Saml Validation error: "</span> + e.getMessage(), e);
+<a name="233" href="#233">233</a>                 <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(
+<a name="234" href="#234">234</a>                     WSSecurityException.FAILURE, <span class="jxr_string">"invalidSAMLsecurity"</span>, <strong class="jxr_keyword">null</strong>, e
+<a name="235" href="#235">235</a>                 );
+<a name="236" href="#236">236</a>             }
+<a name="237" href="#237">237</a>         }
+<a name="238" href="#238">238</a>     }
+<a name="239" href="#239">239</a> 
+<a name="240" href="#240">240</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="241" href="#241">241</a> <em class="jxr_javadoccomment">     * Whether to validate the signature of the Assertion (if it exists) against the </em>
+<a name="242" href="#242">242</a> <em class="jxr_javadoccomment">     * relevant profile. Default is true.</em>
+<a name="243" href="#243">243</a> <em class="jxr_javadoccomment">     */</em>
+<a name="244" href="#244">244</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isValidateSignatureAgainstProfile() {
+<a name="245" href="#245">245</a>         <strong class="jxr_keyword">return</strong> validateSignatureAgainstProfile;
+<a name="246" href="#246">246</a>     }
+<a name="247" href="#247">247</a> 
+<a name="248" href="#248">248</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="249" href="#249">249</a> <em class="jxr_javadoccomment">     * Whether to validate the signature of the Assertion (if it exists) against the </em>
+<a name="250" href="#250">250</a> <em class="jxr_javadoccomment">     * relevant profile. Default is true.</em>
+<a name="251" href="#251">251</a> <em class="jxr_javadoccomment">     */</em>
+<a name="252" href="#252">252</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> setValidateSignatureAgainstProfile(<strong class="jxr_keyword">boolean</strong> validateSignatureAgainstProfile) {
+<a name="253" href="#253">253</a>         <strong class="jxr_keyword">this</strong>.validateSignatureAgainstProfile = validateSignatureAgainstProfile;
+<a name="254" href="#254">254</a>     }
+<a name="255" href="#255">255</a>     
+<a name="256" href="#256">256</a> }
 </pre>
 <hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
 </html>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/validate/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/validate/package-frame.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/validate/package-frame.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/validate/package-frame.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.validate</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.validate</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/org/apache/ws/security/validate/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/org/apache/ws/security/validate/package-summary.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/org/apache/ws/security/validate/package-summary.html (original)
+++ webservices/website/wss4j/xref/org/apache/ws/security/validate/package-summary.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference Package org.apache.ws.security.validate</title>
+		<title>Apache WSS4J 1.6.13 Reference Package org.apache.ws.security.validate</title>
 		<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/overview-frame.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/overview-frame.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/overview-frame.html (original)
+++ webservices/website/wss4j/xref/overview-frame.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference</title>
+		<title>Apache WSS4J 1.6.13 Reference</title>
 		<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
 	</head>
 	<body>

Modified: webservices/website/wss4j/xref/overview-summary.html
URL: http://svn.apache.org/viewvc/webservices/website/wss4j/xref/overview-summary.html?rev=1542988&r1=1542987&r2=1542988&view=diff
==============================================================================
--- webservices/website/wss4j/xref/overview-summary.html (original)
+++ webservices/website/wss4j/xref/overview-summary.html Mon Nov 18 11:33:41 2013
@@ -3,7 +3,7 @@
 <html xml:lang="en" lang="en">
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" />
-		<title>Apache WSS4J 1.6.12 Reference</title>
+		<title>Apache WSS4J 1.6.13 Reference</title>
 		<link rel="stylesheet" type="text/css" href="stylesheet.css" title="style" />
 	</head>
 	<body>
@@ -24,7 +24,7 @@
 	        </ul>
       	</div>
 		
-		      	<h2>Apache WSS4J 1.6.12 Reference</h2>
+		      	<h2>Apache WSS4J 1.6.13 Reference</h2>
 
 		<table class="summary">
         	<thead>