Modified: webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/OpenSAMLUtil.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/OpenSAMLUtil.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/OpenSAMLUtil.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/OpenSAMLUtil.html Mon Oct 3 15:15:52 2011 @@ -38,184 +38,185 @@ <a name="28" href="#28">28</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.signature.SignatureException; <a name="29" href="#29">29</a> <strong class="jxr_keyword">import</strong> org.opensaml.xml.signature.Signer; <a name="30" href="#30">30</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Document; -<a name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Element; -<a name="32" href="#32">32</a> -<a name="33" href="#33">33</a> <em class="jxr_javadoccomment">/**</em> -<a name="34" href="#34">34</a> <em class="jxr_javadoccomment"> * Class OpenSAMLUtil provides static helper methods for the OpenSaml library</em> -<a name="35" href="#35">35</a> <em class="jxr_javadoccomment"> * <p/></em> -<a name="36" href="#36">36</a> <em class="jxr_javadoccomment"> * Created on May 18, 2009</em> -<a name="37" href="#37">37</a> <em class="jxr_javadoccomment"> */</em> -<a name="38" href="#38">38</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/ws/security/saml/ext/OpenSAMLUtil.html">OpenSAMLUtil</a> { -<a name="39" href="#39">39</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="40" href="#40">40</a> org.apache.commons.logging.LogFactory.getLog(OpenSAMLUtil.<strong class="jxr_keyword">class</strong>); -<a name="41" href="#41">41</a> -<a name="42" href="#42">42</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> XMLObjectBuilderFactory builderFactory; -<a name="43" href="#43">43</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> MarshallerFactory marshallerFactory; -<a name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> UnmarshallerFactory unmarshallerFactory; -<a name="45" href="#45">45</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> samlEngineInitialized = false; -<a name="46" href="#46">46</a> -<a name="47" href="#47">47</a> <em class="jxr_javadoccomment">/**</em> -<a name="48" href="#48">48</a> <em class="jxr_javadoccomment"> * Initialise the SAML library</em> -<a name="49" href="#49">49</a> <em class="jxr_javadoccomment"> */</em> -<a name="50" href="#50">50</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">synchronized</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> initSamlEngine() { -<a name="51" href="#51">51</a> <strong class="jxr_keyword">if</strong> (!samlEngineInitialized) { -<a name="52" href="#52">52</a> <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) { -<a name="53" href="#53">53</a> log.debug(<span class="jxr_string">"Initilizing the opensaml2 library..."</span>); -<a name="54" href="#54">54</a> } -<a name="55" href="#55">55</a> <strong class="jxr_keyword">try</strong> { -<a name="56" href="#56">56</a> OpenSAMLBootstrap.bootstrap(); -<a name="57" href="#57">57</a> builderFactory = Configuration.getBuilderFactory(); -<a name="58" href="#58">58</a> marshallerFactory = Configuration.getMarshallerFactory(); -<a name="59" href="#59">59</a> unmarshallerFactory = Configuration.getUnmarshallerFactory(); -<a name="60" href="#60">60</a> samlEngineInitialized = <strong class="jxr_keyword">true</strong>; -<a name="61" href="#61">61</a> <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) { -<a name="62" href="#62">62</a> log.debug(<span class="jxr_string">"opensaml2 library bootstrap complete"</span>); -<a name="63" href="#63">63</a> } -<a name="64" href="#64">64</a> } <strong class="jxr_keyword">catch</strong> (ConfigurationException e) { -<a name="65" href="#65">65</a> log.error( -<a name="66" href="#66">66</a> <span class="jxr_string">"Unable to bootstrap the opensaml2 library - all SAML operations will fail"</span>, -<a name="67" href="#67">67</a> e -<a name="68" href="#68">68</a> ); -<a name="69" href="#69">69</a> } -<a name="70" href="#70">70</a> } -<a name="71" href="#71">71</a> } -<a name="72" href="#72">72</a> -<a name="73" href="#73">73</a> <em class="jxr_javadoccomment">/**</em> -<a name="74" href="#74">74</a> <em class="jxr_javadoccomment"> * Convert a SAML Assertion from a DOM Element to an XMLObject</em> -<a name="75" href="#75">75</a> <em class="jxr_javadoccomment"> *</em> -<a name="76" href="#76">76</a> <em class="jxr_javadoccomment"> * @param root of type Element</em> -<a name="77" href="#77">77</a> <em class="jxr_javadoccomment"> * @return XMLObject</em> -<a name="78" href="#78">78</a> <em class="jxr_javadoccomment"> * @throws UnmarshallingException</em> -<a name="79" href="#79">79</a> <em class="jxr_javadoccomment"> */</em> -<a name="80" href="#80">80</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> XMLObject fromDom(Element root) <strong class="jxr_keyword">throws</strong> WSSecurityException { -<a name="81" href="#81">81</a> Unmarshaller unmarshaller = unmarshallerFactory.getUnmarshaller(root); -<a name="82" href="#82">82</a> <strong class="jxr_keyword">try</strong> { -<a name="83" href="#83">83</a> <strong class="jxr_keyword">return</strong> unmarshaller.unmarshall(root); -<a name="84" href="#84">84</a> } <strong class="jxr_keyword">catch</strong> (UnmarshallingException ex) { -<a name="85" href="#85">85</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Error unmarshalling a SAML assertion"</span>, ex); -<a name="86" href="#86">86</a> } -<a name="87" href="#87">87</a> } -<a name="88" href="#88">88</a> -<a name="89" href="#89">89</a> <em class="jxr_javadoccomment">/**</em> -<a name="90" href="#90">90</a> <em class="jxr_javadoccomment"> * Convert a SAML Assertion from a XMLObject to a DOM Element</em> -<a name="91" href="#91">91</a> <em class="jxr_javadoccomment"> *</em> -<a name="92" href="#92">92</a> <em class="jxr_javadoccomment"> * @param xmlObject of type XMLObject</em> -<a name="93" href="#93">93</a> <em class="jxr_javadoccomment"> * @param doc of type Document</em> -<a name="94" href="#94">94</a> <em class="jxr_javadoccomment"> * @return Element</em> -<a name="95" href="#95">95</a> <em class="jxr_javadoccomment"> * @throws MarshallingException</em> -<a name="96" href="#96">96</a> <em class="jxr_javadoccomment"> * @throws SignatureException</em> -<a name="97" href="#97">97</a> <em class="jxr_javadoccomment"> */</em> -<a name="98" href="#98">98</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Element toDom( -<a name="99" href="#99">99</a> XMLObject xmlObject, -<a name="100" href="#100">100</a> Document doc -<a name="101" href="#101">101</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> { -<a name="102" href="#102">102</a> Marshaller marshaller = marshallerFactory.getMarshaller(xmlObject); -<a name="103" href="#103">103</a> Element element = <strong class="jxr_keyword">null</strong>; -<a name="104" href="#104">104</a> Element orig = doc == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : doc.getDocumentElement(); -<a name="105" href="#105">105</a> <strong class="jxr_keyword">try</strong> { -<a name="106" href="#106">106</a> <strong class="jxr_keyword">if</strong> (orig != <strong class="jxr_keyword">null</strong>) { -<a name="107" href="#107">107</a> doc.removeChild(orig); -<a name="108" href="#108">108</a> } -<a name="109" href="#109">109</a> <strong class="jxr_keyword">try</strong> { -<a name="110" href="#110">110</a> <strong class="jxr_keyword">if</strong> (doc == <strong class="jxr_keyword">null</strong>) { -<a name="111" href="#111">111</a> element = marshaller.marshall(xmlObject); -<a name="112" href="#112">112</a> } <strong class="jxr_keyword">else</strong> { -<a name="113" href="#113">113</a> element = marshaller.marshall(xmlObject, doc); -<a name="114" href="#114">114</a> } -<a name="115" href="#115">115</a> } <strong class="jxr_keyword">catch</strong> (MarshallingException ex) { -<a name="116" href="#116">116</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Error marshalling a SAML assertion"</span>, ex); -<a name="117" href="#117">117</a> } -<a name="118" href="#118">118</a> -<a name="119" href="#119">119</a> <em class="jxr_comment">// Sign the assertion if the signature element is present.</em> -<a name="120" href="#120">120</a> <strong class="jxr_keyword">if</strong> (xmlObject instanceof org.opensaml.saml2.core.Assertion) { -<a name="121" href="#121">121</a> org.opensaml.saml2.core.Assertion saml2 = -<a name="122" href="#122">122</a> (org.opensaml.saml2.core.Assertion) xmlObject; -<a name="123" href="#123">123</a> <em class="jxr_comment">// if there is a signature, but it hasn't already been signed</em> -<a name="124" href="#124">124</a> <strong class="jxr_keyword">if</strong> (saml2.getSignature() != <strong class="jxr_keyword">null</strong>) { -<a name="125" href="#125">125</a> <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) { -<a name="126" href="#126">126</a> log.debug(<span class="jxr_string">"Signing SAML v2.0 assertion..."</span>); -<a name="127" href="#127">127</a> } -<a name="128" href="#128">128</a> <strong class="jxr_keyword">try</strong> { -<a name="129" href="#129">129</a> Signer.signObject(saml2.getSignature()); -<a name="130" href="#130">130</a> } <strong class="jxr_keyword">catch</strong> (SignatureException ex) { -<a name="131" href="#131">131</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Error signing a SAML assertion"</span>, ex); -<a name="132" href="#132">132</a> } -<a name="133" href="#133">133</a> } -<a name="134" href="#134">134</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (xmlObject instanceof org.opensaml.saml1.core.Assertion) { -<a name="135" href="#135">135</a> org.opensaml.saml1.core.Assertion saml1 = -<a name="136" href="#136">136</a> (org.opensaml.saml1.core.Assertion) xmlObject; -<a name="137" href="#137">137</a> <em class="jxr_comment">// if there is a signature, but it hasn't already been signed</em> -<a name="138" href="#138">138</a> <strong class="jxr_keyword">if</strong> (saml1.getSignature() != <strong class="jxr_keyword">null</strong>) { -<a name="139" href="#139">139</a> <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) { -<a name="140" href="#140">140</a> log.debug(<span class="jxr_string">"Signing SAML v1.1 assertion..."</span>); -<a name="141" href="#141">141</a> } -<a name="142" href="#142">142</a> <strong class="jxr_keyword">try</strong> { -<a name="143" href="#143">143</a> Signer.signObject(saml1.getSignature()); -<a name="144" href="#144">144</a> } <strong class="jxr_keyword">catch</strong> (SignatureException ex) { -<a name="145" href="#145">145</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Error signing a SAML assertion"</span>, ex); -<a name="146" href="#146">146</a> } -<a name="147" href="#147">147</a> } -<a name="148" href="#148">148</a> } -<a name="149" href="#149">149</a> } <strong class="jxr_keyword">finally</strong> { -<a name="150" href="#150">150</a> <strong class="jxr_keyword">if</strong> (doc != <strong class="jxr_keyword">null</strong> && doc.getDocumentElement() != orig) { -<a name="151" href="#151">151</a> <strong class="jxr_keyword">if</strong> (doc.getDocumentElement() != <strong class="jxr_keyword">null</strong>) { -<a name="152" href="#152">152</a> doc.removeChild(doc.getDocumentElement()); -<a name="153" href="#153">153</a> } -<a name="154" href="#154">154</a> <strong class="jxr_keyword">if</strong> (orig != <strong class="jxr_keyword">null</strong>) { -<a name="155" href="#155">155</a> doc.appendChild(orig); +<a name="31" href="#31">31</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.DocumentFragment; +<a name="32" href="#32">32</a> <strong class="jxr_keyword">import</strong> org.w3c.dom.Element; +<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"> * Class OpenSAMLUtil provides static helper methods for the OpenSaml library</em> +<a name="36" href="#36">36</a> <em class="jxr_javadoccomment"> * <p/></em> +<a name="37" href="#37">37</a> <em class="jxr_javadoccomment"> * Created on May 18, 2009</em> +<a name="38" href="#38">38</a> <em class="jxr_javadoccomment"> */</em> +<a name="39" href="#39">39</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/ws/security/saml/ext/OpenSAMLUtil.html">OpenSAMLUtil</a> { +<a name="40" href="#40">40</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="41" href="#41">41</a> org.apache.commons.logging.LogFactory.getLog(OpenSAMLUtil.<strong class="jxr_keyword">class</strong>); +<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> XMLObjectBuilderFactory builderFactory; +<a name="44" href="#44">44</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> MarshallerFactory marshallerFactory; +<a name="45" href="#45">45</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> UnmarshallerFactory unmarshallerFactory; +<a name="46" href="#46">46</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> samlEngineInitialized = false; +<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"> * Initialise the SAML library</em> +<a name="50" href="#50">50</a> <em class="jxr_javadoccomment"> */</em> +<a name="51" href="#51">51</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">synchronized</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> initSamlEngine() { +<a name="52" href="#52">52</a> <strong class="jxr_keyword">if</strong> (!samlEngineInitialized) { +<a name="53" href="#53">53</a> <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) { +<a name="54" href="#54">54</a> log.debug(<span class="jxr_string">"Initilizing the opensaml2 library..."</span>); +<a name="55" href="#55">55</a> } +<a name="56" href="#56">56</a> <strong class="jxr_keyword">try</strong> { +<a name="57" href="#57">57</a> OpenSAMLBootstrap.bootstrap(); +<a name="58" href="#58">58</a> builderFactory = Configuration.getBuilderFactory(); +<a name="59" href="#59">59</a> marshallerFactory = Configuration.getMarshallerFactory(); +<a name="60" href="#60">60</a> unmarshallerFactory = Configuration.getUnmarshallerFactory(); +<a name="61" href="#61">61</a> samlEngineInitialized = <strong class="jxr_keyword">true</strong>; +<a name="62" href="#62">62</a> <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) { +<a name="63" href="#63">63</a> log.debug(<span class="jxr_string">"opensaml2 library bootstrap complete"</span>); +<a name="64" href="#64">64</a> } +<a name="65" href="#65">65</a> } <strong class="jxr_keyword">catch</strong> (ConfigurationException e) { +<a name="66" href="#66">66</a> log.error( +<a name="67" href="#67">67</a> <span class="jxr_string">"Unable to bootstrap the opensaml2 library - all SAML operations will fail"</span>, +<a name="68" href="#68">68</a> e +<a name="69" href="#69">69</a> ); +<a name="70" href="#70">70</a> } +<a name="71" href="#71">71</a> } +<a name="72" href="#72">72</a> } +<a name="73" href="#73">73</a> +<a name="74" href="#74">74</a> <em class="jxr_javadoccomment">/**</em> +<a name="75" href="#75">75</a> <em class="jxr_javadoccomment"> * Convert a SAML Assertion from a DOM Element to an XMLObject</em> +<a name="76" href="#76">76</a> <em class="jxr_javadoccomment"> *</em> +<a name="77" href="#77">77</a> <em class="jxr_javadoccomment"> * @param root of type Element</em> +<a name="78" href="#78">78</a> <em class="jxr_javadoccomment"> * @return XMLObject</em> +<a name="79" href="#79">79</a> <em class="jxr_javadoccomment"> * @throws UnmarshallingException</em> +<a name="80" href="#80">80</a> <em class="jxr_javadoccomment"> */</em> +<a name="81" href="#81">81</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> XMLObject fromDom(Element root) <strong class="jxr_keyword">throws</strong> WSSecurityException { +<a name="82" href="#82">82</a> Unmarshaller unmarshaller = unmarshallerFactory.getUnmarshaller(root); +<a name="83" href="#83">83</a> <strong class="jxr_keyword">try</strong> { +<a name="84" href="#84">84</a> <strong class="jxr_keyword">return</strong> unmarshaller.unmarshall(root); +<a name="85" href="#85">85</a> } <strong class="jxr_keyword">catch</strong> (UnmarshallingException ex) { +<a name="86" href="#86">86</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Error unmarshalling a SAML assertion"</span>, ex); +<a name="87" href="#87">87</a> } +<a name="88" href="#88">88</a> } +<a name="89" href="#89">89</a> +<a name="90" href="#90">90</a> <em class="jxr_javadoccomment">/**</em> +<a name="91" href="#91">91</a> <em class="jxr_javadoccomment"> * Convert a SAML Assertion from a XMLObject to a DOM Element</em> +<a name="92" href="#92">92</a> <em class="jxr_javadoccomment"> *</em> +<a name="93" href="#93">93</a> <em class="jxr_javadoccomment"> * @param xmlObject of type XMLObject</em> +<a name="94" href="#94">94</a> <em class="jxr_javadoccomment"> * @param doc of type Document</em> +<a name="95" href="#95">95</a> <em class="jxr_javadoccomment"> * @return Element</em> +<a name="96" href="#96">96</a> <em class="jxr_javadoccomment"> * @throws MarshallingException</em> +<a name="97" href="#97">97</a> <em class="jxr_javadoccomment"> * @throws SignatureException</em> +<a name="98" href="#98">98</a> <em class="jxr_javadoccomment"> */</em> +<a name="99" href="#99">99</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Element toDom( +<a name="100" href="#100">100</a> XMLObject xmlObject, +<a name="101" href="#101">101</a> Document doc +<a name="102" href="#102">102</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> { +<a name="103" href="#103">103</a> Marshaller marshaller = marshallerFactory.getMarshaller(xmlObject); +<a name="104" href="#104">104</a> Element element = <strong class="jxr_keyword">null</strong>; +<a name="105" href="#105">105</a> DocumentFragment frag = doc == <strong class="jxr_keyword">null</strong> ? <strong class="jxr_keyword">null</strong> : doc.createDocumentFragment(); +<a name="106" href="#106">106</a> <strong class="jxr_keyword">try</strong> { +<a name="107" href="#107">107</a> <strong class="jxr_keyword">if</strong> (frag != <strong class="jxr_keyword">null</strong>) { +<a name="108" href="#108">108</a> <strong class="jxr_keyword">while</strong> (doc.getFirstChild() != <strong class="jxr_keyword">null</strong>) { +<a name="109" href="#109">109</a> frag.appendChild(doc.removeChild(doc.getFirstChild())); +<a name="110" href="#110">110</a> } +<a name="111" href="#111">111</a> } +<a name="112" href="#112">112</a> <strong class="jxr_keyword">try</strong> { +<a name="113" href="#113">113</a> <strong class="jxr_keyword">if</strong> (doc == <strong class="jxr_keyword">null</strong>) { +<a name="114" href="#114">114</a> element = marshaller.marshall(xmlObject); +<a name="115" href="#115">115</a> } <strong class="jxr_keyword">else</strong> { +<a name="116" href="#116">116</a> element = marshaller.marshall(xmlObject, doc); +<a name="117" href="#117">117</a> } +<a name="118" href="#118">118</a> } <strong class="jxr_keyword">catch</strong> (MarshallingException ex) { +<a name="119" href="#119">119</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Error marshalling a SAML assertion"</span>, ex); +<a name="120" href="#120">120</a> } +<a name="121" href="#121">121</a> +<a name="122" href="#122">122</a> <em class="jxr_comment">// Sign the assertion if the signature element is present.</em> +<a name="123" href="#123">123</a> <strong class="jxr_keyword">if</strong> (xmlObject instanceof org.opensaml.saml2.core.Assertion) { +<a name="124" href="#124">124</a> org.opensaml.saml2.core.Assertion saml2 = +<a name="125" href="#125">125</a> (org.opensaml.saml2.core.Assertion) xmlObject; +<a name="126" href="#126">126</a> <em class="jxr_comment">// if there is a signature, but it hasn't already been signed</em> +<a name="127" href="#127">127</a> <strong class="jxr_keyword">if</strong> (saml2.getSignature() != <strong class="jxr_keyword">null</strong>) { +<a name="128" href="#128">128</a> <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) { +<a name="129" href="#129">129</a> log.debug(<span class="jxr_string">"Signing SAML v2.0 assertion..."</span>); +<a name="130" href="#130">130</a> } +<a name="131" href="#131">131</a> <strong class="jxr_keyword">try</strong> { +<a name="132" href="#132">132</a> Signer.signObject(saml2.getSignature()); +<a name="133" href="#133">133</a> } <strong class="jxr_keyword">catch</strong> (SignatureException ex) { +<a name="134" href="#134">134</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Error signing a SAML assertion"</span>, ex); +<a name="135" href="#135">135</a> } +<a name="136" href="#136">136</a> } +<a name="137" href="#137">137</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (xmlObject instanceof org.opensaml.saml1.core.Assertion) { +<a name="138" href="#138">138</a> org.opensaml.saml1.core.Assertion saml1 = +<a name="139" href="#139">139</a> (org.opensaml.saml1.core.Assertion) xmlObject; +<a name="140" href="#140">140</a> <em class="jxr_comment">// if there is a signature, but it hasn't already been signed</em> +<a name="141" href="#141">141</a> <strong class="jxr_keyword">if</strong> (saml1.getSignature() != <strong class="jxr_keyword">null</strong>) { +<a name="142" href="#142">142</a> <strong class="jxr_keyword">if</strong> (log.isDebugEnabled()) { +<a name="143" href="#143">143</a> log.debug(<span class="jxr_string">"Signing SAML v1.1 assertion..."</span>); +<a name="144" href="#144">144</a> } +<a name="145" href="#145">145</a> <strong class="jxr_keyword">try</strong> { +<a name="146" href="#146">146</a> Signer.signObject(saml1.getSignature()); +<a name="147" href="#147">147</a> } <strong class="jxr_keyword">catch</strong> (SignatureException ex) { +<a name="148" href="#148">148</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(<span class="jxr_string">"Error signing a SAML assertion"</span>, ex); +<a name="149" href="#149">149</a> } +<a name="150" href="#150">150</a> } +<a name="151" href="#151">151</a> } +<a name="152" href="#152">152</a> } <strong class="jxr_keyword">finally</strong> { +<a name="153" href="#153">153</a> <strong class="jxr_keyword">if</strong> (frag != <strong class="jxr_keyword">null</strong>) { +<a name="154" href="#154">154</a> <strong class="jxr_keyword">while</strong> (doc.getFirstChild() != <strong class="jxr_keyword">null</strong>) { +<a name="155" href="#155">155</a> doc.removeChild(doc.getFirstChild()); <a name="156" href="#156">156</a> } -<a name="157" href="#157">157</a> } -<a name="158" href="#158">158</a> } -<a name="159" href="#159">159</a> <strong class="jxr_keyword">return</strong> element; -<a name="160" href="#160">160</a> } -<a name="161" href="#161">161</a> -<a name="162" href="#162">162</a> <em class="jxr_javadoccomment">/**</em> -<a name="163" href="#163">163</a> <em class="jxr_javadoccomment"> * Method buildSignature ...</em> -<a name="164" href="#164">164</a> <em class="jxr_javadoccomment"> *</em> -<a name="165" href="#165">165</a> <em class="jxr_javadoccomment"> * @return Signature</em> -<a name="166" href="#166">166</a> <em class="jxr_javadoccomment"> */</em> -<a name="167" href="#167">167</a> @SuppressWarnings(<span class="jxr_string">"unchecked"</span>) -<a name="168" href="#168">168</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Signature buildSignature() { -<a name="169" href="#169">169</a> QName qName = Signature.DEFAULT_ELEMENT_NAME; -<a name="170" href="#170">170</a> XMLObjectBuilder<Signature> builder = builderFactory.getBuilder(qName); -<a name="171" href="#171">171</a> <strong class="jxr_keyword">if</strong> (builder == <strong class="jxr_keyword">null</strong>) { -<a name="172" href="#172">172</a> log.error( -<a name="173" href="#173">173</a> <span class="jxr_string">"Unable to retrieve builder for object QName "</span> -<a name="174" href="#174">174</a> + qName -<a name="175" href="#175">175</a> ); -<a name="176" href="#176">176</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>; -<a name="177" href="#177">177</a> } -<a name="178" href="#178">178</a> <strong class="jxr_keyword">return</strong> -<a name="179" href="#179">179</a> (Signature)builder.buildObject( -<a name="180" href="#180">180</a> qName.getNamespaceURI(), qName.getLocalPart(), qName.getPrefix() -<a name="181" href="#181">181</a> ); -<a name="182" href="#182">182</a> } -<a name="183" href="#183">183</a> -<a name="184" href="#184">184</a> <em class="jxr_javadoccomment">/**</em> -<a name="185" href="#185">185</a> <em class="jxr_javadoccomment"> * Method isMethodSenderVouches ...</em> -<a name="186" href="#186">186</a> <em class="jxr_javadoccomment"> *</em> -<a name="187" href="#187">187</a> <em class="jxr_javadoccomment"> * @param confirmMethod of type String</em> -<a name="188" href="#188">188</a> <em class="jxr_javadoccomment"> * @return boolean</em> -<a name="189" href="#189">189</a> <em class="jxr_javadoccomment"> */</em> -<a name="190" href="#190">190</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> isMethodSenderVouches(String confirmMethod) { -<a name="191" href="#191">191</a> <strong class="jxr_keyword">return</strong> -<a name="192" href="#192">192</a> confirmMethod != <strong class="jxr_keyword">null</strong> && confirmMethod.startsWith(<span class="jxr_string">"urn:oasis:names:tc:SAML:"</span>) -<a name="193" href="#193">193</a> && confirmMethod.endsWith(<span class="jxr_string">":cm:sender-vouches"</span>); -<a name="194" href="#194">194</a> } -<a name="195" href="#195">195</a> -<a name="196" href="#196">196</a> <em class="jxr_javadoccomment">/**</em> -<a name="197" href="#197">197</a> <em class="jxr_javadoccomment"> * Method isMethodHolderOfKey ...</em> -<a name="198" href="#198">198</a> <em class="jxr_javadoccomment"> *</em> -<a name="199" href="#199">199</a> <em class="jxr_javadoccomment"> * @param confirmMethod of type String</em> -<a name="200" href="#200">200</a> <em class="jxr_javadoccomment"> * @return boolean</em> -<a name="201" href="#201">201</a> <em class="jxr_javadoccomment"> */</em> -<a name="202" href="#202">202</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> isMethodHolderOfKey(String confirmMethod) { -<a name="203" href="#203">203</a> <strong class="jxr_keyword">return</strong> -<a name="204" href="#204">204</a> confirmMethod != <strong class="jxr_keyword">null</strong> && confirmMethod.startsWith(<span class="jxr_string">"urn:oasis:names:tc:SAML:"</span>) -<a name="205" href="#205">205</a> && confirmMethod.endsWith(<span class="jxr_string">":cm:holder-of-key"</span>); -<a name="206" href="#206">206</a> } -<a name="207" href="#207">207</a> -<a name="208" href="#208">208</a> } +<a name="157" href="#157">157</a> doc.appendChild(frag); +<a name="158" href="#158">158</a> } +<a name="159" href="#159">159</a> } +<a name="160" href="#160">160</a> <strong class="jxr_keyword">return</strong> element; +<a name="161" href="#161">161</a> } +<a name="162" href="#162">162</a> +<a name="163" href="#163">163</a> <em class="jxr_javadoccomment">/**</em> +<a name="164" href="#164">164</a> <em class="jxr_javadoccomment"> * Method buildSignature ...</em> +<a name="165" href="#165">165</a> <em class="jxr_javadoccomment"> *</em> +<a name="166" href="#166">166</a> <em class="jxr_javadoccomment"> * @return Signature</em> +<a name="167" href="#167">167</a> <em class="jxr_javadoccomment"> */</em> +<a name="168" href="#168">168</a> @SuppressWarnings(<span class="jxr_string">"unchecked"</span>) +<a name="169" href="#169">169</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Signature buildSignature() { +<a name="170" href="#170">170</a> QName qName = Signature.DEFAULT_ELEMENT_NAME; +<a name="171" href="#171">171</a> XMLObjectBuilder<Signature> builder = builderFactory.getBuilder(qName); +<a name="172" href="#172">172</a> <strong class="jxr_keyword">if</strong> (builder == <strong class="jxr_keyword">null</strong>) { +<a name="173" href="#173">173</a> log.error( +<a name="174" href="#174">174</a> <span class="jxr_string">"Unable to retrieve builder for object QName "</span> +<a name="175" href="#175">175</a> + qName +<a name="176" href="#176">176</a> ); +<a name="177" href="#177">177</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>; +<a name="178" href="#178">178</a> } +<a name="179" href="#179">179</a> <strong class="jxr_keyword">return</strong> +<a name="180" href="#180">180</a> (Signature)builder.buildObject( +<a name="181" href="#181">181</a> qName.getNamespaceURI(), qName.getLocalPart(), qName.getPrefix() +<a name="182" href="#182">182</a> ); +<a name="183" href="#183">183</a> } +<a name="184" href="#184">184</a> +<a name="185" href="#185">185</a> <em class="jxr_javadoccomment">/**</em> +<a name="186" href="#186">186</a> <em class="jxr_javadoccomment"> * Method isMethodSenderVouches ...</em> +<a name="187" href="#187">187</a> <em class="jxr_javadoccomment"> *</em> +<a name="188" href="#188">188</a> <em class="jxr_javadoccomment"> * @param confirmMethod of type String</em> +<a name="189" href="#189">189</a> <em class="jxr_javadoccomment"> * @return boolean</em> +<a name="190" href="#190">190</a> <em class="jxr_javadoccomment"> */</em> +<a name="191" href="#191">191</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> isMethodSenderVouches(String confirmMethod) { +<a name="192" href="#192">192</a> <strong class="jxr_keyword">return</strong> +<a name="193" href="#193">193</a> confirmMethod != <strong class="jxr_keyword">null</strong> && confirmMethod.startsWith(<span class="jxr_string">"urn:oasis:names:tc:SAML:"</span>) +<a name="194" href="#194">194</a> && confirmMethod.endsWith(<span class="jxr_string">":cm:sender-vouches"</span>); +<a name="195" href="#195">195</a> } +<a name="196" href="#196">196</a> +<a name="197" href="#197">197</a> <em class="jxr_javadoccomment">/**</em> +<a name="198" href="#198">198</a> <em class="jxr_javadoccomment"> * Method isMethodHolderOfKey ...</em> +<a name="199" href="#199">199</a> <em class="jxr_javadoccomment"> *</em> +<a name="200" href="#200">200</a> <em class="jxr_javadoccomment"> * @param confirmMethod of type String</em> +<a name="201" href="#201">201</a> <em class="jxr_javadoccomment"> * @return boolean</em> +<a name="202" href="#202">202</a> <em class="jxr_javadoccomment"> */</em> +<a name="203" href="#203">203</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">boolean</strong> isMethodHolderOfKey(String confirmMethod) { +<a name="204" href="#204">204</a> <strong class="jxr_keyword">return</strong> +<a name="205" href="#205">205</a> confirmMethod != <strong class="jxr_keyword">null</strong> && confirmMethod.startsWith(<span class="jxr_string">"urn:oasis:names:tc:SAML:"</span>) +<a name="206" href="#206">206</a> && confirmMethod.endsWith(<span class="jxr_string">":cm:holder-of-key"</span>); +<a name="207" href="#207">207</a> } +<a name="208" href="#208">208</a> +<a name="209" href="#209">209</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/wss4j/site/xref/org/apache/ws/security/saml/ext/bean/package-frame.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/bean/package-frame.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/bean/package-frame.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/bean/package-frame.html Mon Oct 3 15:15:52 2011 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> - <title>WSS4J 1.6.2 Reference Package org.apache.ws.security.saml.ext.bean</title> + <title>WSS4J 1.6.3 Reference Package org.apache.ws.security.saml.ext.bean</title> <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" /> </head> <body> Modified: webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/bean/package-summary.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/bean/package-summary.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/bean/package-summary.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/bean/package-summary.html Mon Oct 3 15:15:52 2011 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> - <title>WSS4J 1.6.2 Reference Package org.apache.ws.security.saml.ext.bean</title> + <title>WSS4J 1.6.3 Reference Package org.apache.ws.security.saml.ext.bean</title> <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="style" /> </head> <body> Modified: webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.html Mon Oct 3 15:15:52 2011 @@ -145,7 +145,7 @@ <a name="135" href="#135">135</a> assertion.setVersion(SAMLVersion.VERSION_11); <a name="136" href="#136">136</a> assertion.setIssuer(issuer); <a name="137" href="#137">137</a> assertion.setIssueInstant(<strong class="jxr_keyword">new</strong> DateTime()); <em class="jxr_comment">// now</em> -<a name="138" href="#138">138</a> assertion.setID(UUIDGenerator.getUUID()); +<a name="138" href="#138">138</a> assertion.setID(<span class="jxr_string">"_"</span> + UUIDGenerator.getUUID()); <a name="139" href="#139">139</a> <strong class="jxr_keyword">return</strong> assertion; <a name="140" href="#140">140</a> } <a name="141" href="#141">141</a> Modified: webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.html Mon Oct 3 15:15:52 2011 @@ -144,7 +144,7 @@ <a name="134" href="#134">134</a> } <a name="135" href="#135">135</a> Assertion assertion = <a name="136" href="#136">136</a> assertionBuilder.buildObject(Assertion.DEFAULT_ELEMENT_NAME, Assertion.TYPE_NAME); -<a name="137" href="#137">137</a> assertion.setID(UUIDGenerator.getUUID()); +<a name="137" href="#137">137</a> assertion.setID(<span class="jxr_string">"_"</span> + UUIDGenerator.getUUID()); <a name="138" href="#138">138</a> assertion.setVersion(SAMLVersion.VERSION_20); <a name="139" href="#139">139</a> assertion.setIssueInstant(<strong class="jxr_keyword">new</strong> DateTime()); <a name="140" href="#140">140</a> <strong class="jxr_keyword">return</strong> assertion; Modified: webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/package-frame.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/package-frame.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/package-frame.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/package-frame.html Mon Oct 3 15:15:52 2011 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> - <title>WSS4J 1.6.2 Reference Package org.apache.ws.security.saml.ext.builder</title> + <title>WSS4J 1.6.3 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/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/package-summary.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/package-summary.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/package-summary.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/builder/package-summary.html Mon Oct 3 15:15:52 2011 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> - <title>WSS4J 1.6.2 Reference Package org.apache.ws.security.saml.ext.builder</title> + <title>WSS4J 1.6.3 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/wss4j/site/xref/org/apache/ws/security/saml/ext/package-frame.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/package-frame.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/package-frame.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/package-frame.html Mon Oct 3 15:15:52 2011 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> - <title>WSS4J 1.6.2 Reference Package org.apache.ws.security.saml.ext</title> + <title>WSS4J 1.6.3 Reference Package org.apache.ws.security.saml.ext</title> <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" /> </head> <body> Modified: webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/package-summary.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/package-summary.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/package-summary.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/ext/package-summary.html Mon Oct 3 15:15:52 2011 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> - <title>WSS4J 1.6.2 Reference Package org.apache.ws.security.saml.ext</title> + <title>WSS4J 1.6.3 Reference Package org.apache.ws.security.saml.ext</title> <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="style" /> </head> <body> Modified: webservices/wss4j/site/xref/org/apache/ws/security/saml/package-frame.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/package-frame.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/package-frame.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/package-frame.html Mon Oct 3 15:15:52 2011 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> - <title>WSS4J 1.6.2 Reference Package org.apache.ws.security.saml</title> + <title>WSS4J 1.6.3 Reference Package org.apache.ws.security.saml</title> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" /> </head> <body> Modified: webservices/wss4j/site/xref/org/apache/ws/security/saml/package-summary.html URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/saml/package-summary.html?rev=1178426&r1=1178425&r2=1178426&view=diff ============================================================================== --- webservices/wss4j/site/xref/org/apache/ws/security/saml/package-summary.html (original) +++ webservices/wss4j/site/xref/org/apache/ws/security/saml/package-summary.html Mon Oct 3 15:15:52 2011 @@ -3,7 +3,7 @@ <html xml:lang="en" lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1" /> - <title>WSS4J 1.6.2 Reference Package org.apache.ws.security.saml</title> + <title>WSS4J 1.6.3 Reference Package org.apache.ws.security.saml</title> <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" /> </head> <body>
