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 2011/12/06 11:24:32 UTC
svn commit: r1210847 [40/42] - in /webservices/wss4j/site: ./ 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/class-use/ apidocs/org/apache/...
Modified: webservices/wss4j/site/xref/org/apache/ws/security/str/SecurityTokenRefSTRParser.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/str/SecurityTokenRefSTRParser.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/str/SecurityTokenRefSTRParser.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/str/SecurityTokenRefSTRParser.html Tue Dec 6 10:23:54 2011
@@ -107,221 +107,227 @@
<a name="97" href="#97">97</a> <a href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a> result = wsDocInfo.getResult(uri);
<a name="98" href="#98">98</a> <strong class="jxr_keyword">if</strong> (result != <strong class="jxr_keyword">null</strong>) {
<a name="99" href="#99">99</a> processPreviousResult(result, secRef, data, parameters, wsDocInfo, bspCompliant);
-<a name="100" href="#100">100</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (secRef.containsReference()) {
-<a name="101" href="#101">101</a> <a href="../../../../../org/apache/ws/security/message/token/Reference.html">Reference</a> reference = secRef.getReference();
-<a name="102" href="#102">102</a> <em class="jxr_comment">// Try asking the CallbackHandler for the secret key</em>
-<a name="103" href="#103">103</a> secretKey = getSecretKeyFromToken(uri, reference.getValueType(), data);
-<a name="104" href="#104">104</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
-<a name="105" href="#105">105</a> Element token =
-<a name="106" href="#106">106</a> secRef.getTokenElement(strElement.getOwnerDocument(), wsDocInfo, data.getCallbackHandler());
-<a name="107" href="#107">107</a> QName el = <strong class="jxr_keyword">new</strong> QName(token.getNamespaceURI(), token.getLocalName());
-<a name="108" href="#108">108</a> <strong class="jxr_keyword">if</strong> (el.equals(WSSecurityEngine.BINARY_TOKEN)) {
-<a name="109" href="#109">109</a> <a href="../../../../../org/apache/ws/security/processor/Processor.html">Processor</a> proc = data.getWssConfig().getProcessor(WSSecurityEngine.BINARY_TOKEN);
-<a name="110" href="#110">110</a> List<WSSecurityEngineResult> bstResult =
-<a name="111" href="#111">111</a> proc.handleToken(token, data, wsDocInfo);
-<a name="112" href="#112">112</a> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> bstToken =
-<a name="113" href="#113">113</a> (<a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>)bstResult.get(0).get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-<a name="114" href="#114">114</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
-<a name="115" href="#115">115</a> BSPEnforcer.checkBinarySecurityBSPCompliance(secRef, bstToken);
-<a name="116" href="#116">116</a> }
-<a name="117" href="#117">117</a> secretKey = (byte[])bstResult.get(0).get(WSSecurityEngineResult.TAG_SECRET);
-<a name="118" href="#118">118</a> }
-<a name="119" href="#119">119</a> }
-<a name="120" href="#120">120</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
-<a name="121" href="#121">121</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="122" href="#122">122</a> WSSecurityException.FAILED_CHECK, <span class="jxr_string">"unsupportedKeyId"</span>, <strong class="jxr_keyword">new</strong> Object[] {uri}
-<a name="123" href="#123">123</a> );
-<a name="124" href="#124">124</a> }
-<a name="125" href="#125">125</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (secRef.containsKeyIdentifier()) {
-<a name="126" href="#126">126</a> String valueType = secRef.getKeyIdentifierValueType();
-<a name="127" href="#127">127</a> <strong class="jxr_keyword">if</strong> (WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(valueType)
-<a name="128" href="#128">128</a> || WSConstants.WSS_SAML2_KI_VALUE_TYPE.equals(valueType)) {
-<a name="129" href="#129">129</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion =
-<a name="130" href="#130">130</a> SAMLUtil.getAssertionFromKeyIdentifier(
-<a name="131" href="#131">131</a> secRef, strElement,
-<a name="132" href="#132">132</a> data, wsDocInfo
-<a name="133" href="#133">133</a> );
-<a name="134" href="#134">134</a> secretKey =
-<a name="135" href="#135">135</a> getSecretKeyFromAssertion(assertion, secRef, data, wsDocInfo, bspCompliant);
-<a name="136" href="#136">136</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.WSS_KRB_KI_VALUE_TYPE.equals(valueType)) {
-<a name="137" href="#137">137</a> secretKey =
-<a name="138" href="#138">138</a> getSecretKeyFromToken(secRef.getKeyIdentifierValue(), valueType, data);
-<a name="139" href="#139">139</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
-<a name="140" href="#140">140</a> byte[] keyBytes = secRef.getSKIBytes();
-<a name="141" href="#141">141</a> List<WSSecurityEngineResult> resultsList =
-<a name="142" href="#142">142</a> wsDocInfo.getResultsByTag(WSConstants.BST);
-<a name="143" href="#143">143</a> <strong class="jxr_keyword">for</strong> (WSSecurityEngineResult bstResult : resultsList) {
-<a name="144" href="#144">144</a> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> bstToken =
-<a name="145" href="#145">145</a> (<a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>)bstResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
-<a name="146" href="#146">146</a> byte[] tokenDigest = WSSecurityUtil.generateDigest(bstToken.getToken());
-<a name="147" href="#147">147</a> <strong class="jxr_keyword">if</strong> (Arrays.equals(tokenDigest, keyBytes)) {
-<a name="148" href="#148">148</a> secretKey = (byte[])bstResult.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="149" href="#149">149</a> <strong class="jxr_keyword">break</strong>;
-<a name="150" href="#150">150</a> }
-<a name="151" href="#151">151</a> }
-<a name="152" href="#152">152</a> }
-<a name="153" href="#153">153</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
-<a name="154" href="#154">154</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="155" href="#155">155</a> WSSecurityException.FAILED_CHECK, <span class="jxr_string">"unsupportedKeyId"</span>, <strong class="jxr_keyword">new</strong> Object[] {uri}
-<a name="156" href="#156">156</a> );
-<a name="157" href="#157">157</a> }
-<a name="158" href="#158">158</a> } <strong class="jxr_keyword">else</strong> {
-<a name="159" href="#159">159</a> <strong class="jxr_keyword">if</strong> (bspCompliant && SecurityTokenReference.ENC_KEY_SHA1_URI.equals(valueType)) {
-<a name="160" href="#160">160</a> BSPEnforcer.checkEncryptedKeyBSPCompliance(secRef);
-<a name="161" href="#161">161</a> }
-<a name="162" href="#162">162</a> secretKey =
-<a name="163" href="#163">163</a> getSecretKeyFromToken(
-<a name="164" href="#164">164</a> secRef.getKeyIdentifierValue(), secRef.getKeyIdentifierValueType(), data
-<a name="165" href="#165">165</a> );
-<a name="166" href="#166">166</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
-<a name="167" href="#167">167</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="168" href="#168">168</a> WSSecurityException.FAILED_CHECK, <span class="jxr_string">"unsupportedKeyId"</span>, <strong class="jxr_keyword">new</strong> Object[] {uri}
-<a name="169" href="#169">169</a> );
-<a name="170" href="#170">170</a> }
-<a name="171" href="#171">171</a> }
-<a name="172" href="#172">172</a> } <strong class="jxr_keyword">else</strong> {
-<a name="173" href="#173">173</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a>(WSSecurityException.FAILED_CHECK, <span class="jxr_string">"noReference"</span>);
-<a name="174" href="#174">174</a> }
-<a name="175" href="#175">175</a> }
-<a name="176" href="#176">176</a>
-<a name="177" href="#177">177</a> <em class="jxr_javadoccomment">/**</em>
-<a name="178" href="#178">178</a> <em class="jxr_javadoccomment"> * Get the X509Certificates associated with this SecurityTokenReference</em>
-<a name="179" href="#179">179</a> <em class="jxr_javadoccomment"> * @return the X509Certificates associated with this SecurityTokenReference</em>
-<a name="180" href="#180">180</a> <em class="jxr_javadoccomment"> */</em>
-<a name="181" href="#181">181</a> <strong class="jxr_keyword">public</strong> X509Certificate[] getCertificates() {
-<a name="182" href="#182">182</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<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"> * Get the Principal associated with this SecurityTokenReference</em>
-<a name="187" href="#187">187</a> <em class="jxr_javadoccomment"> * @return the Principal associated with this SecurityTokenReference</em>
-<a name="188" href="#188">188</a> <em class="jxr_javadoccomment"> */</em>
-<a name="189" href="#189">189</a> <strong class="jxr_keyword">public</strong> Principal getPrincipal() {
-<a name="190" href="#190">190</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="191" href="#191">191</a> }
-<a name="192" href="#192">192</a>
-<a name="193" href="#193">193</a> <em class="jxr_javadoccomment">/**</em>
-<a name="194" href="#194">194</a> <em class="jxr_javadoccomment"> * Get the PublicKey associated with this SecurityTokenReference</em>
-<a name="195" href="#195">195</a> <em class="jxr_javadoccomment"> * @return the PublicKey associated with this SecurityTokenReference</em>
-<a name="196" href="#196">196</a> <em class="jxr_javadoccomment"> */</em>
-<a name="197" href="#197">197</a> <strong class="jxr_keyword">public</strong> PublicKey getPublicKey() {
-<a name="198" href="#198">198</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<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"> * Get the Secret Key associated with this SecurityTokenReference</em>
-<a name="203" href="#203">203</a> <em class="jxr_javadoccomment"> * @return the Secret Key associated with this SecurityTokenReference</em>
-<a name="204" href="#204">204</a> <em class="jxr_javadoccomment"> */</em>
-<a name="205" href="#205">205</a> <strong class="jxr_keyword">public</strong> byte[] getSecretKey() {
-<a name="206" href="#206">206</a> <strong class="jxr_keyword">return</strong> secretKey;
-<a name="207" href="#207">207</a> }
-<a name="208" href="#208">208</a>
-<a name="209" href="#209">209</a> <em class="jxr_javadoccomment">/**</em>
-<a name="210" href="#210">210</a> <em class="jxr_javadoccomment"> * Get whether the returned credential is already trusted or not. This is currently</em>
-<a name="211" href="#211">211</a> <em class="jxr_javadoccomment"> * applicable in the case of a credential extracted from a trusted HOK SAML Assertion,</em>
-<a name="212" href="#212">212</a> <em class="jxr_javadoccomment"> * and a BinarySecurityToken that has been processed by a Validator. In these cases,</em>
-<a name="213" href="#213">213</a> <em class="jxr_javadoccomment"> * the SignatureProcessor does not need to verify trust on the credential.</em>
-<a name="214" href="#214">214</a> <em class="jxr_javadoccomment"> * @return true if trust has already been verified on the returned Credential</em>
-<a name="215" href="#215">215</a> <em class="jxr_javadoccomment"> */</em>
-<a name="216" href="#216">216</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isTrustedCredential() {
-<a name="217" href="#217">217</a> <strong class="jxr_keyword">return</strong> false;
-<a name="218" href="#218">218</a> }
-<a name="219" href="#219">219</a>
-<a name="220" href="#220">220</a> <em class="jxr_javadoccomment">/**</em>
-<a name="221" href="#221">221</a> <em class="jxr_javadoccomment"> * Get the Secret Key from a CallbackHandler</em>
-<a name="222" href="#222">222</a> <em class="jxr_javadoccomment"> * @param id The id of the element</em>
-<a name="223" href="#223">223</a> <em class="jxr_javadoccomment"> * @param type The type of the element (may be null)</em>
-<a name="224" href="#224">224</a> <em class="jxr_javadoccomment"> * @param cb The CallbackHandler object</em>
-<a name="225" href="#225">225</a> <em class="jxr_javadoccomment"> * @return A Secret Key</em>
-<a name="226" href="#226">226</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
-<a name="227" href="#227">227</a> <em class="jxr_javadoccomment"> */</em>
-<a name="228" href="#228">228</a> <strong class="jxr_keyword">private</strong> byte[] getSecretKeyFromToken(
-<a name="229" href="#229">229</a> String id,
-<a name="230" href="#230">230</a> String type,
-<a name="231" href="#231">231</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data
-<a name="232" href="#232">232</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="233" href="#233">233</a> <strong class="jxr_keyword">if</strong> (id.charAt(0) == '#') {
-<a name="234" href="#234">234</a> id = id.substring(1);
-<a name="235" href="#235">235</a> }
-<a name="236" href="#236">236</a> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwcb =
-<a name="237" href="#237">237</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(id, <strong class="jxr_keyword">null</strong>, type, WSPasswordCallback.SECRET_KEY, data);
-<a name="238" href="#238">238</a> <strong class="jxr_keyword">try</strong> {
-<a name="239" href="#239">239</a> Callback[] callbacks = <strong class="jxr_keyword">new</strong> Callback[]{pwcb};
-<a name="240" href="#240">240</a> <strong class="jxr_keyword">if</strong> (data.getCallbackHandler() != <strong class="jxr_keyword">null</strong>) {
-<a name="241" href="#241">241</a> data.getCallbackHandler().handle(callbacks);
-<a name="242" href="#242">242</a> <strong class="jxr_keyword">return</strong> pwcb.getKey();
-<a name="243" href="#243">243</a> }
-<a name="244" href="#244">244</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
-<a name="245" href="#245">245</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="246" href="#246">246</a> WSSecurityException.FAILURE,
-<a name="247" href="#247">247</a> <span class="jxr_string">"noPassword"</span>,
-<a name="248" href="#248">248</a> <strong class="jxr_keyword">new</strong> Object[] {id},
-<a name="249" href="#249">249</a> e
-<a name="250" href="#250">250</a> );
-<a name="251" href="#251">251</a> }
-<a name="252" href="#252">252</a>
-<a name="253" href="#253">253</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="254" href="#254">254</a> }
-<a name="255" href="#255">255</a>
-<a name="256" href="#256">256</a> <em class="jxr_javadoccomment">/**</em>
-<a name="257" href="#257">257</a> <em class="jxr_javadoccomment"> * Get a SecretKey from a SAML Assertion</em>
-<a name="258" href="#258">258</a> <em class="jxr_javadoccomment"> */</em>
-<a name="259" href="#259">259</a> <strong class="jxr_keyword">private</strong> byte[] getSecretKeyFromAssertion(
-<a name="260" href="#260">260</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion,
-<a name="261" href="#261">261</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef,
-<a name="262" href="#262">262</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data,
-<a name="263" href="#263">263</a> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo,
-<a name="264" href="#264">264</a> <strong class="jxr_keyword">boolean</strong> bspCompliant
-<a name="265" href="#265">265</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="266" href="#266">266</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
-<a name="267" href="#267">267</a> BSPEnforcer.checkSamlTokenBSPCompliance(secRef, assertion);
-<a name="268" href="#268">268</a> }
-<a name="269" href="#269">269</a> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> samlKi =
-<a name="270" href="#270">270</a> SAMLUtil.getCredentialFromSubject(assertion, data, wsDocInfo, bspCompliant);
-<a name="271" href="#271">271</a> <strong class="jxr_keyword">if</strong> (samlKi == <strong class="jxr_keyword">null</strong>) {
-<a name="272" href="#272">272</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="273" href="#273">273</a> WSSecurityException.FAILED_CHECK, <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[] {<span class="jxr_string">"No Secret Key"</span>}
-<a name="274" href="#274">274</a> );
-<a name="275" href="#275">275</a> }
-<a name="276" href="#276">276</a> <strong class="jxr_keyword">return</strong> samlKi.getSecret();
-<a name="277" href="#277">277</a> }
-<a name="278" href="#278">278</a>
-<a name="279" href="#279">279</a> <em class="jxr_javadoccomment">/**</em>
-<a name="280" href="#280">280</a> <em class="jxr_javadoccomment"> * Process a previous security result</em>
-<a name="281" href="#281">281</a> <em class="jxr_javadoccomment"> */</em>
-<a name="282" href="#282">282</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> processPreviousResult(
-<a name="283" href="#283">283</a> <a href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a> result,
-<a name="284" href="#284">284</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef,
-<a name="285" href="#285">285</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data,
-<a name="286" href="#286">286</a> Map<String, Object> parameters,
-<a name="287" href="#287">287</a> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo,
-<a name="288" href="#288">288</a> <strong class="jxr_keyword">boolean</strong> bspCompliant
-<a name="289" href="#289">289</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
-<a name="290" href="#290">290</a> <strong class="jxr_keyword">int</strong> action = ((Integer)result.get(WSSecurityEngineResult.TAG_ACTION)).intValue();
-<a name="291" href="#291">291</a> <strong class="jxr_keyword">if</strong> (WSConstants.ENCR == action) {
-<a name="292" href="#292">292</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
-<a name="293" href="#293">293</a> BSPEnforcer.checkEncryptedKeyBSPCompliance(secRef);
-<a name="294" href="#294">294</a> }
-<a name="295" href="#295">295</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="296" href="#296">296</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.DKT == action) {
-<a name="297" href="#297">297</a> <a href="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html">DerivedKeyToken</a> dkt =
-<a name="298" href="#298">298</a> (<a href="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html">DerivedKeyToken</a>)result.get(WSSecurityEngineResult.TAG_DERIVED_KEY_TOKEN);
-<a name="299" href="#299">299</a> byte[] secret =
-<a name="300" href="#300">300</a> (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="301" href="#301">301</a> String algorithm = (String)parameters.get(SIGNATURE_METHOD);
-<a name="302" href="#302">302</a> secretKey = dkt.deriveKey(WSSecurityUtil.getKeyLength(algorithm), secret);
-<a name="303" href="#303">303</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.ST_UNSIGNED == action || WSConstants.ST_SIGNED == action) {
-<a name="304" href="#304">304</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion =
-<a name="305" href="#305">305</a> (<a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a>)result.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
-<a name="306" href="#306">306</a> secretKey =
-<a name="307" href="#307">307</a> getSecretKeyFromAssertion(assertion, secRef, data, wsDocInfo, bspCompliant);
-<a name="308" href="#308">308</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.SCT == action || WSConstants.BST == action) {
-<a name="309" href="#309">309</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
-<a name="310" href="#310">310</a> }
-<a name="311" href="#311">311</a> }
-<a name="312" href="#312">312</a>
-<a name="313" href="#313">313</a>
-<a name="314" href="#314">314</a> }
+<a name="100" href="#100">100</a>
+<a name="101" href="#101">101</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
+<a name="102" href="#102">102</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="103" href="#103">103</a> WSSecurityException.FAILED_CHECK, <span class="jxr_string">"unsupportedKeyId"</span>, <strong class="jxr_keyword">new</strong> Object[] {uri}
+<a name="104" href="#104">104</a> );
+<a name="105" href="#105">105</a> }
+<a name="106" href="#106">106</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (secRef.containsReference()) {
+<a name="107" href="#107">107</a> <a href="../../../../../org/apache/ws/security/message/token/Reference.html">Reference</a> reference = secRef.getReference();
+<a name="108" href="#108">108</a> <em class="jxr_comment">// Try asking the CallbackHandler for the secret key</em>
+<a name="109" href="#109">109</a> secretKey = getSecretKeyFromToken(uri, reference.getValueType(), data);
+<a name="110" href="#110">110</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
+<a name="111" href="#111">111</a> Element token =
+<a name="112" href="#112">112</a> secRef.getTokenElement(strElement.getOwnerDocument(), wsDocInfo, data.getCallbackHandler());
+<a name="113" href="#113">113</a> QName el = <strong class="jxr_keyword">new</strong> QName(token.getNamespaceURI(), token.getLocalName());
+<a name="114" href="#114">114</a> <strong class="jxr_keyword">if</strong> (el.equals(WSSecurityEngine.BINARY_TOKEN)) {
+<a name="115" href="#115">115</a> <a href="../../../../../org/apache/ws/security/processor/Processor.html">Processor</a> proc = data.getWssConfig().getProcessor(WSSecurityEngine.BINARY_TOKEN);
+<a name="116" href="#116">116</a> List<WSSecurityEngineResult> bstResult =
+<a name="117" href="#117">117</a> proc.handleToken(token, data, wsDocInfo);
+<a name="118" href="#118">118</a> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> bstToken =
+<a name="119" href="#119">119</a> (<a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>)bstResult.get(0).get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
+<a name="120" href="#120">120</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
+<a name="121" href="#121">121</a> BSPEnforcer.checkBinarySecurityBSPCompliance(secRef, bstToken);
+<a name="122" href="#122">122</a> }
+<a name="123" href="#123">123</a> secretKey = (byte[])bstResult.get(0).get(WSSecurityEngineResult.TAG_SECRET);
+<a name="124" href="#124">124</a> }
+<a name="125" href="#125">125</a> }
+<a name="126" href="#126">126</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
+<a name="127" href="#127">127</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="128" href="#128">128</a> WSSecurityException.FAILED_CHECK, <span class="jxr_string">"unsupportedKeyId"</span>, <strong class="jxr_keyword">new</strong> Object[] {uri}
+<a name="129" href="#129">129</a> );
+<a name="130" href="#130">130</a> }
+<a name="131" href="#131">131</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (secRef.containsKeyIdentifier()) {
+<a name="132" href="#132">132</a> String valueType = secRef.getKeyIdentifierValueType();
+<a name="133" href="#133">133</a> <strong class="jxr_keyword">if</strong> (WSConstants.WSS_SAML_KI_VALUE_TYPE.equals(valueType)
+<a name="134" href="#134">134</a> || WSConstants.WSS_SAML2_KI_VALUE_TYPE.equals(valueType)) {
+<a name="135" href="#135">135</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion =
+<a name="136" href="#136">136</a> SAMLUtil.getAssertionFromKeyIdentifier(
+<a name="137" href="#137">137</a> secRef, strElement,
+<a name="138" href="#138">138</a> data, wsDocInfo
+<a name="139" href="#139">139</a> );
+<a name="140" href="#140">140</a> secretKey =
+<a name="141" href="#141">141</a> getSecretKeyFromAssertion(assertion, secRef, data, wsDocInfo, bspCompliant);
+<a name="142" href="#142">142</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.WSS_KRB_KI_VALUE_TYPE.equals(valueType)) {
+<a name="143" href="#143">143</a> secretKey =
+<a name="144" href="#144">144</a> getSecretKeyFromToken(secRef.getKeyIdentifierValue(), valueType, data);
+<a name="145" href="#145">145</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
+<a name="146" href="#146">146</a> byte[] keyBytes = secRef.getSKIBytes();
+<a name="147" href="#147">147</a> List<WSSecurityEngineResult> resultsList =
+<a name="148" href="#148">148</a> wsDocInfo.getResultsByTag(WSConstants.BST);
+<a name="149" href="#149">149</a> <strong class="jxr_keyword">for</strong> (WSSecurityEngineResult bstResult : resultsList) {
+<a name="150" href="#150">150</a> <a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a> bstToken =
+<a name="151" href="#151">151</a> (<a href="../../../../../org/apache/ws/security/message/token/BinarySecurity.html">BinarySecurity</a>)bstResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
+<a name="152" href="#152">152</a> byte[] tokenDigest = WSSecurityUtil.generateDigest(bstToken.getToken());
+<a name="153" href="#153">153</a> <strong class="jxr_keyword">if</strong> (Arrays.equals(tokenDigest, keyBytes)) {
+<a name="154" href="#154">154</a> secretKey = (byte[])bstResult.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="155" href="#155">155</a> <strong class="jxr_keyword">break</strong>;
+<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">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
+<a name="160" href="#160">160</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="161" href="#161">161</a> WSSecurityException.FAILED_CHECK, <span class="jxr_string">"unsupportedKeyId"</span>, <strong class="jxr_keyword">new</strong> Object[] {uri}
+<a name="162" href="#162">162</a> );
+<a name="163" href="#163">163</a> }
+<a name="164" href="#164">164</a> } <strong class="jxr_keyword">else</strong> {
+<a name="165" href="#165">165</a> <strong class="jxr_keyword">if</strong> (bspCompliant && SecurityTokenReference.ENC_KEY_SHA1_URI.equals(valueType)) {
+<a name="166" href="#166">166</a> BSPEnforcer.checkEncryptedKeyBSPCompliance(secRef);
+<a name="167" href="#167">167</a> }
+<a name="168" href="#168">168</a> secretKey =
+<a name="169" href="#169">169</a> getSecretKeyFromToken(
+<a name="170" href="#170">170</a> secRef.getKeyIdentifierValue(), secRef.getKeyIdentifierValueType(), data
+<a name="171" href="#171">171</a> );
+<a name="172" href="#172">172</a> <strong class="jxr_keyword">if</strong> (secretKey == <strong class="jxr_keyword">null</strong>) {
+<a name="173" href="#173">173</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="174" href="#174">174</a> WSSecurityException.FAILED_CHECK, <span class="jxr_string">"unsupportedKeyId"</span>, <strong class="jxr_keyword">new</strong> Object[] {uri}
+<a name="175" href="#175">175</a> );
+<a name="176" href="#176">176</a> }
+<a name="177" href="#177">177</a> }
+<a name="178" href="#178">178</a> } <strong class="jxr_keyword">else</strong> {
+<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>(WSSecurityException.FAILED_CHECK, <span class="jxr_string">"noReference"</span>);
+<a name="180" href="#180">180</a> }
+<a name="181" href="#181">181</a> }
+<a name="182" href="#182">182</a>
+<a name="183" href="#183">183</a> <em class="jxr_javadoccomment">/**</em>
+<a name="184" href="#184">184</a> <em class="jxr_javadoccomment"> * Get the X509Certificates associated with this SecurityTokenReference</em>
+<a name="185" href="#185">185</a> <em class="jxr_javadoccomment"> * @return the X509Certificates associated with this SecurityTokenReference</em>
+<a name="186" href="#186">186</a> <em class="jxr_javadoccomment"> */</em>
+<a name="187" href="#187">187</a> <strong class="jxr_keyword">public</strong> X509Certificate[] getCertificates() {
+<a name="188" href="#188">188</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="189" href="#189">189</a> }
+<a name="190" href="#190">190</a>
+<a name="191" href="#191">191</a> <em class="jxr_javadoccomment">/**</em>
+<a name="192" href="#192">192</a> <em class="jxr_javadoccomment"> * Get the Principal associated with this SecurityTokenReference</em>
+<a name="193" href="#193">193</a> <em class="jxr_javadoccomment"> * @return the Principal associated with this SecurityTokenReference</em>
+<a name="194" href="#194">194</a> <em class="jxr_javadoccomment"> */</em>
+<a name="195" href="#195">195</a> <strong class="jxr_keyword">public</strong> Principal getPrincipal() {
+<a name="196" href="#196">196</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="197" href="#197">197</a> }
+<a name="198" href="#198">198</a>
+<a name="199" href="#199">199</a> <em class="jxr_javadoccomment">/**</em>
+<a name="200" href="#200">200</a> <em class="jxr_javadoccomment"> * Get the PublicKey associated with this SecurityTokenReference</em>
+<a name="201" href="#201">201</a> <em class="jxr_javadoccomment"> * @return the PublicKey associated with this SecurityTokenReference</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> PublicKey getPublicKey() {
+<a name="204" href="#204">204</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="205" href="#205">205</a> }
+<a name="206" href="#206">206</a>
+<a name="207" href="#207">207</a> <em class="jxr_javadoccomment">/**</em>
+<a name="208" href="#208">208</a> <em class="jxr_javadoccomment"> * Get the Secret Key associated with this SecurityTokenReference</em>
+<a name="209" href="#209">209</a> <em class="jxr_javadoccomment"> * @return the Secret Key associated with this SecurityTokenReference</em>
+<a name="210" href="#210">210</a> <em class="jxr_javadoccomment"> */</em>
+<a name="211" href="#211">211</a> <strong class="jxr_keyword">public</strong> byte[] getSecretKey() {
+<a name="212" href="#212">212</a> <strong class="jxr_keyword">return</strong> secretKey;
+<a name="213" href="#213">213</a> }
+<a name="214" href="#214">214</a>
+<a name="215" href="#215">215</a> <em class="jxr_javadoccomment">/**</em>
+<a name="216" href="#216">216</a> <em class="jxr_javadoccomment"> * Get whether the returned credential is already trusted or not. This is currently</em>
+<a name="217" href="#217">217</a> <em class="jxr_javadoccomment"> * applicable in the case of a credential extracted from a trusted HOK SAML Assertion,</em>
+<a name="218" href="#218">218</a> <em class="jxr_javadoccomment"> * and a BinarySecurityToken that has been processed by a Validator. In these cases,</em>
+<a name="219" href="#219">219</a> <em class="jxr_javadoccomment"> * the SignatureProcessor does not need to verify trust on the credential.</em>
+<a name="220" href="#220">220</a> <em class="jxr_javadoccomment"> * @return true if trust has already been verified on the returned Credential</em>
+<a name="221" href="#221">221</a> <em class="jxr_javadoccomment"> */</em>
+<a name="222" href="#222">222</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">boolean</strong> isTrustedCredential() {
+<a name="223" href="#223">223</a> <strong class="jxr_keyword">return</strong> false;
+<a name="224" href="#224">224</a> }
+<a name="225" href="#225">225</a>
+<a name="226" href="#226">226</a> <em class="jxr_javadoccomment">/**</em>
+<a name="227" href="#227">227</a> <em class="jxr_javadoccomment"> * Get the Secret Key from a CallbackHandler</em>
+<a name="228" href="#228">228</a> <em class="jxr_javadoccomment"> * @param id The id of the element</em>
+<a name="229" href="#229">229</a> <em class="jxr_javadoccomment"> * @param type The type of the element (may be null)</em>
+<a name="230" href="#230">230</a> <em class="jxr_javadoccomment"> * @param cb The CallbackHandler object</em>
+<a name="231" href="#231">231</a> <em class="jxr_javadoccomment"> * @return A Secret Key</em>
+<a name="232" href="#232">232</a> <em class="jxr_javadoccomment"> * @throws WSSecurityException</em>
+<a name="233" href="#233">233</a> <em class="jxr_javadoccomment"> */</em>
+<a name="234" href="#234">234</a> <strong class="jxr_keyword">private</strong> byte[] getSecretKeyFromToken(
+<a name="235" href="#235">235</a> String id,
+<a name="236" href="#236">236</a> String type,
+<a name="237" href="#237">237</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data
+<a name="238" href="#238">238</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="239" href="#239">239</a> <strong class="jxr_keyword">if</strong> (id.charAt(0) == '#') {
+<a name="240" href="#240">240</a> id = id.substring(1);
+<a name="241" href="#241">241</a> }
+<a name="242" href="#242">242</a> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a> pwcb =
+<a name="243" href="#243">243</a> <strong class="jxr_keyword">new</strong> <a href="../../../../../org/apache/ws/security/WSPasswordCallback.html">WSPasswordCallback</a>(id, <strong class="jxr_keyword">null</strong>, type, WSPasswordCallback.SECRET_KEY, data);
+<a name="244" href="#244">244</a> <strong class="jxr_keyword">try</strong> {
+<a name="245" href="#245">245</a> Callback[] callbacks = <strong class="jxr_keyword">new</strong> Callback[]{pwcb};
+<a name="246" href="#246">246</a> <strong class="jxr_keyword">if</strong> (data.getCallbackHandler() != <strong class="jxr_keyword">null</strong>) {
+<a name="247" href="#247">247</a> data.getCallbackHandler().handle(callbacks);
+<a name="248" href="#248">248</a> <strong class="jxr_keyword">return</strong> pwcb.getKey();
+<a name="249" href="#249">249</a> }
+<a name="250" href="#250">250</a> } <strong class="jxr_keyword">catch</strong> (Exception e) {
+<a name="251" href="#251">251</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="252" href="#252">252</a> WSSecurityException.FAILURE,
+<a name="253" href="#253">253</a> <span class="jxr_string">"noPassword"</span>,
+<a name="254" href="#254">254</a> <strong class="jxr_keyword">new</strong> Object[] {id},
+<a name="255" href="#255">255</a> e
+<a name="256" href="#256">256</a> );
+<a name="257" href="#257">257</a> }
+<a name="258" href="#258">258</a>
+<a name="259" href="#259">259</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="260" href="#260">260</a> }
+<a name="261" href="#261">261</a>
+<a name="262" href="#262">262</a> <em class="jxr_javadoccomment">/**</em>
+<a name="263" href="#263">263</a> <em class="jxr_javadoccomment"> * Get a SecretKey from a SAML Assertion</em>
+<a name="264" href="#264">264</a> <em class="jxr_javadoccomment"> */</em>
+<a name="265" href="#265">265</a> <strong class="jxr_keyword">private</strong> byte[] getSecretKeyFromAssertion(
+<a name="266" href="#266">266</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion,
+<a name="267" href="#267">267</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef,
+<a name="268" href="#268">268</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data,
+<a name="269" href="#269">269</a> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo,
+<a name="270" href="#270">270</a> <strong class="jxr_keyword">boolean</strong> bspCompliant
+<a name="271" href="#271">271</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="272" href="#272">272</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
+<a name="273" href="#273">273</a> BSPEnforcer.checkSamlTokenBSPCompliance(secRef, assertion);
+<a name="274" href="#274">274</a> }
+<a name="275" href="#275">275</a> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> samlKi =
+<a name="276" href="#276">276</a> SAMLUtil.getCredentialFromSubject(assertion, data, wsDocInfo, bspCompliant);
+<a name="277" href="#277">277</a> <strong class="jxr_keyword">if</strong> (samlKi == <strong class="jxr_keyword">null</strong>) {
+<a name="278" href="#278">278</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="279" href="#279">279</a> WSSecurityException.FAILED_CHECK, <span class="jxr_string">"invalidSAMLToken"</span>, <strong class="jxr_keyword">new</strong> Object[] {<span class="jxr_string">"No Secret Key"</span>}
+<a name="280" href="#280">280</a> );
+<a name="281" href="#281">281</a> }
+<a name="282" href="#282">282</a> <strong class="jxr_keyword">return</strong> samlKi.getSecret();
+<a name="283" href="#283">283</a> }
+<a name="284" href="#284">284</a>
+<a name="285" href="#285">285</a> <em class="jxr_javadoccomment">/**</em>
+<a name="286" href="#286">286</a> <em class="jxr_javadoccomment"> * Process a previous security result</em>
+<a name="287" href="#287">287</a> <em class="jxr_javadoccomment"> */</em>
+<a name="288" href="#288">288</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">void</strong> processPreviousResult(
+<a name="289" href="#289">289</a> <a href="../../../../../org/apache/ws/security/WSSecurityEngineResult.html">WSSecurityEngineResult</a> result,
+<a name="290" href="#290">290</a> <a href="../../../../../org/apache/ws/security/message/token/SecurityTokenReference.html">SecurityTokenReference</a> secRef,
+<a name="291" href="#291">291</a> <a href="../../../../../org/apache/ws/security/handler/RequestData.html">RequestData</a> data,
+<a name="292" href="#292">292</a> Map<String, Object> parameters,
+<a name="293" href="#293">293</a> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo,
+<a name="294" href="#294">294</a> <strong class="jxr_keyword">boolean</strong> bspCompliant
+<a name="295" href="#295">295</a> ) <strong class="jxr_keyword">throws</strong> <a href="../../../../../org/apache/ws/security/WSSecurityException.html">WSSecurityException</a> {
+<a name="296" href="#296">296</a> <strong class="jxr_keyword">int</strong> action = ((Integer)result.get(WSSecurityEngineResult.TAG_ACTION)).intValue();
+<a name="297" href="#297">297</a> <strong class="jxr_keyword">if</strong> (WSConstants.ENCR == action) {
+<a name="298" href="#298">298</a> <strong class="jxr_keyword">if</strong> (bspCompliant) {
+<a name="299" href="#299">299</a> BSPEnforcer.checkEncryptedKeyBSPCompliance(secRef);
+<a name="300" href="#300">300</a> }
+<a name="301" href="#301">301</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="302" href="#302">302</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.DKT == action) {
+<a name="303" href="#303">303</a> <a href="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html">DerivedKeyToken</a> dkt =
+<a name="304" href="#304">304</a> (<a href="../../../../../org/apache/ws/security/message/token/DerivedKeyToken.html">DerivedKeyToken</a>)result.get(WSSecurityEngineResult.TAG_DERIVED_KEY_TOKEN);
+<a name="305" href="#305">305</a> byte[] secret =
+<a name="306" href="#306">306</a> (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="307" href="#307">307</a> String algorithm = (String)parameters.get(SIGNATURE_METHOD);
+<a name="308" href="#308">308</a> secretKey = dkt.deriveKey(WSSecurityUtil.getKeyLength(algorithm), secret);
+<a name="309" href="#309">309</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.ST_UNSIGNED == action || WSConstants.ST_SIGNED == action) {
+<a name="310" href="#310">310</a> <a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a> assertion =
+<a name="311" href="#311">311</a> (<a href="../../../../../org/apache/ws/security/saml/ext/AssertionWrapper.html">AssertionWrapper</a>)result.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+<a name="312" href="#312">312</a> secretKey =
+<a name="313" href="#313">313</a> getSecretKeyFromAssertion(assertion, secRef, data, wsDocInfo, bspCompliant);
+<a name="314" href="#314">314</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (WSConstants.SCT == action || WSConstants.BST == action) {
+<a name="315" href="#315">315</a> secretKey = (byte[])result.get(WSSecurityEngineResult.TAG_SECRET);
+<a name="316" href="#316">316</a> }
+<a name="317" href="#317">317</a> }
+<a name="318" href="#318">318</a>
+<a name="319" href="#319">319</a>
+<a name="320" href="#320">320</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/str/SignatureSTRParser.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/str/SignatureSTRParser.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/str/SignatureSTRParser.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/str/SignatureSTRParser.html Tue Dec 6 10:23:54 2011
@@ -180,7 +180,7 @@
<a name="170" href="#170">170</a> }
<a name="171" href="#171">171</a> <a href="../../../../../org/apache/ws/security/saml/SAMLKeyInfo.html">SAMLKeyInfo</a> keyInfo = assertion.getSubjectKeyInfo();
<a name="172" href="#172">172</a> X509Certificate[] foundCerts = keyInfo.getCerts();
-<a name="173" href="#173">173</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong>) {
+<a name="173" href="#173">173</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong> && foundCerts.length > 0) {
<a name="174" href="#174">174</a> certs = <strong class="jxr_keyword">new</strong> X509Certificate[]{foundCerts[0]};
<a name="175" href="#175">175</a> }
<a name="176" href="#176">176</a> secretKey = keyInfo.getSecret();
@@ -199,7 +199,7 @@
<a name="189" href="#189">189</a> }
<a name="190" href="#190">190</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (secRef.containsX509Data() || secRef.containsX509IssuerSerial()) {
<a name="191" href="#191">191</a> X509Certificate[] foundCerts = secRef.getX509IssuerSerial(crypto);
-<a name="192" href="#192">192</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong>) {
+<a name="192" href="#192">192</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong> && foundCerts.length > 0) {
<a name="193" href="#193">193</a> certs = <strong class="jxr_keyword">new</strong> X509Certificate[]{foundCerts[0]};
<a name="194" href="#194">194</a> }
<a name="195" href="#195">195</a> } <strong class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong> (secRef.containsKeyIdentifier()) {
@@ -224,7 +224,7 @@
<a name="214" href="#214">214</a> SAMLUtil.getCredentialFromSubject(assertion, data,
<a name="215" href="#215">215</a> wsDocInfo, bspCompliant);
<a name="216" href="#216">216</a> X509Certificate[] foundCerts = samlKi.getCerts();
-<a name="217" href="#217">217</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong>) {
+<a name="217" href="#217">217</a> <strong class="jxr_keyword">if</strong> (foundCerts != <strong class="jxr_keyword">null</strong> && foundCerts.length > 0) {
<a name="218" href="#218">218</a> certs = <strong class="jxr_keyword">new</strong> X509Certificate[]{foundCerts[0]};
<a name="219" href="#219">219</a> }
<a name="220" href="#220">220</a> secretKey = samlKi.getSecret();
@@ -241,7 +241,7 @@
<a name="231" href="#231">231</a> );
<a name="232" href="#232">232</a> }
<a name="233" href="#233">233</a>
-<a name="234" href="#234">234</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong> && principal == <strong class="jxr_keyword">null</strong>) {
+<a name="234" href="#234">234</a> <strong class="jxr_keyword">if</strong> (certs != <strong class="jxr_keyword">null</strong> && certs.length > 0 && principal == <strong class="jxr_keyword">null</strong>) {
<a name="235" href="#235">235</a> principal = certs[0].getSubjectX500Principal();
<a name="236" href="#236">236</a> }
<a name="237" href="#237">237</a> }
Modified: webservices/wss4j/site/xref/org/apache/ws/security/str/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/str/package-frame.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/str/package-frame.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/str/package-frame.html Tue Dec 6 10:23:54 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.3 Reference Package org.apache.ws.security.str</title>
+ <title>WSS4J 1.6.4 Reference Package org.apache.ws.security.str</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/str/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/str/package-summary.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/str/package-summary.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/str/package-summary.html Tue Dec 6 10:23:54 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.3 Reference Package org.apache.ws.security.str</title>
+ <title>WSS4J 1.6.4 Reference Package org.apache.ws.security.str</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/transform/STRTransform.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/transform/STRTransform.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/transform/STRTransform.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/transform/STRTransform.html Tue Dec 6 10:23:54 2011
@@ -191,114 +191,118 @@
<a name="181" href="#181">181</a> <em class="jxr_comment">//</em>
<a name="182" href="#182">182</a> <em class="jxr_comment">// Third and fourth step are performed by dereferenceSTR()</em>
<a name="183" href="#183">183</a> <em class="jxr_comment">//</em>
-<a name="184" href="#184">184</a> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo = (WSDocInfo)xc.getProperty(TRANSFORM_WS_DOC_INFO);
-<a name="185" href="#185">185</a> <strong class="jxr_keyword">if</strong> (wsDocInfo == <strong class="jxr_keyword">null</strong>) {
-<a name="186" href="#186">186</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> TransformException(<span class="jxr_string">"no WSDocInfo found"</span>);
-<a name="187" href="#187">187</a> }
-<a name="188" href="#188">188</a>
-<a name="189" href="#189">189</a> Document doc = str.getOwnerDocument();
-<a name="190" href="#190">190</a> Element dereferencedToken =
-<a name="191" href="#191">191</a> STRTransformUtil.dereferenceSTR(doc, secRef, wsDocInfo);
-<a name="192" href="#192">192</a>
-<a name="193" href="#193">193</a> <strong class="jxr_keyword">if</strong> (dereferencedToken != <strong class="jxr_keyword">null</strong>) {
-<a name="194" href="#194">194</a> String type = dereferencedToken.getAttribute(<span class="jxr_string">"ValueType"</span>);
-<a name="195" href="#195">195</a> <strong class="jxr_keyword">if</strong> ((X509Security.X509_V3_TYPE.equals(type)
-<a name="196" href="#196">196</a> || PKIPathSecurity.getType().equals(type))) {
-<a name="197" href="#197">197</a> <em class="jxr_comment">//</em>
-<a name="198" href="#198">198</a> <em class="jxr_comment">// Add the WSSE/WSU namespaces to the element for C14n</em>
-<a name="199" href="#199">199</a> <em class="jxr_comment">//</em>
-<a name="200" href="#200">200</a> WSSecurityUtil.setNamespace(
-<a name="201" href="#201">201</a> dereferencedToken, WSConstants.WSSE_NS, WSConstants.WSSE_PREFIX
-<a name="202" href="#202">202</a> );
-<a name="203" href="#203">203</a> WSSecurityUtil.setNamespace(
-<a name="204" href="#204">204</a> dereferencedToken, WSConstants.WSU_NS, WSConstants.WSU_PREFIX
-<a name="205" href="#205">205</a> );
-<a name="206" href="#206">206</a> }
-<a name="207" href="#207">207</a> }
-<a name="208" href="#208">208</a>
-<a name="209" href="#209">209</a> <em class="jxr_comment">//</em>
-<a name="210" href="#210">210</a> <em class="jxr_comment">// C14n with specified algorithm. According to WSS Specification.</em>
-<a name="211" href="#211">211</a> <em class="jxr_comment">//</em>
-<a name="212" href="#212">212</a> buf = canon.canonicalizeSubtree(dereferencedToken, <span class="jxr_string">"#default"</span>);
-<a name="213" href="#213">213</a> <strong class="jxr_keyword">if</strong> (doDebug) {
-<a name="214" href="#214">214</a> bos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream(buf.length);
-<a name="215" href="#215">215</a> bos.write(buf, 0, buf.length);
-<a name="216" href="#216">216</a> log.debug(<span class="jxr_string">"after c14n: "</span> + bos.toString());
-<a name="217" href="#217">217</a> }
-<a name="218" href="#218">218</a>
-<a name="219" href="#219">219</a> <em class="jxr_comment">//</em>
-<a name="220" href="#220">220</a> <em class="jxr_comment">// Alert: Hacks ahead According to WSS spec an Apex node must</em>
-<a name="221" href="#221">221</a> <em class="jxr_comment">// contain a default namespace. If none is availabe in the first</em>
-<a name="222" href="#222">222</a> <em class="jxr_comment">// node of the c14n output (this is the apex element) then we do</em>
-<a name="223" href="#223">223</a> <em class="jxr_comment">// some editing to insert an empty default namespace</em>
-<a name="224" href="#224">224</a> <em class="jxr_comment">// </em>
-<a name="225" href="#225">225</a> <em class="jxr_comment">// TODO: Rework theses hacks after c14n was updated and can be</em>
-<a name="226" href="#226">226</a> <em class="jxr_comment">// instructed to insert empty default namespace if required</em>
-<a name="227" href="#227">227</a> <em class="jxr_comment">//</em>
-<a name="228" href="#228">228</a> <em class="jxr_comment">// If the problem with c14n method is solved then just do:</em>
-<a name="229" href="#229">229</a> <em class="jxr_comment">// return new XMLSignatureInput(buf);</em>
-<a name="230" href="#230">230</a>
-<a name="231" href="#231">231</a> <em class="jxr_comment">// start of HACK</em>
-<a name="232" href="#232">232</a> StringBuilder bf = <strong class="jxr_keyword">new</strong> StringBuilder(<strong class="jxr_keyword">new</strong> String(buf));
-<a name="233" href="#233">233</a> String bf1 = bf.toString();
-<a name="234" href="#234">234</a>
-<a name="235" href="#235">235</a> <em class="jxr_comment">//</em>
-<a name="236" href="#236">236</a> <em class="jxr_comment">// Find start and end of first element <....>, this is the Apex node</em>
-<a name="237" href="#237">237</a> <em class="jxr_comment">//</em>
-<a name="238" href="#238">238</a> <strong class="jxr_keyword">int</strong> gt = bf1.indexOf(<span class="jxr_string">">"</span>);
+<a name="184" href="#184">184</a> Object wsDocInfoObject = xc.getProperty(TRANSFORM_WS_DOC_INFO);
+<a name="185" href="#185">185</a> <a href="../../../../../org/apache/ws/security/WSDocInfo.html">WSDocInfo</a> wsDocInfo = <strong class="jxr_keyword">null</strong>;
+<a name="186" href="#186">186</a> <strong class="jxr_keyword">if</strong> (wsDocInfoObject instanceof WSDocInfo) {
+<a name="187" href="#187">187</a> wsDocInfo = (WSDocInfo)wsDocInfoObject;
+<a name="188" href="#188">188</a> }
+<a name="189" href="#189">189</a> <strong class="jxr_keyword">if</strong> (wsDocInfo == <strong class="jxr_keyword">null</strong> && doDebug) {
+<a name="190" href="#190">190</a> log.debug(<span class="jxr_string">"STRTransform: no WSDocInfo found"</span>);
+<a name="191" href="#191">191</a> }
+<a name="192" href="#192">192</a>
+<a name="193" href="#193">193</a> Document doc = str.getOwnerDocument();
+<a name="194" href="#194">194</a> Element dereferencedToken =
+<a name="195" href="#195">195</a> STRTransformUtil.dereferenceSTR(doc, secRef, wsDocInfo);
+<a name="196" href="#196">196</a>
+<a name="197" href="#197">197</a> <strong class="jxr_keyword">if</strong> (dereferencedToken != <strong class="jxr_keyword">null</strong>) {
+<a name="198" href="#198">198</a> String type = dereferencedToken.getAttribute(<span class="jxr_string">"ValueType"</span>);
+<a name="199" href="#199">199</a> <strong class="jxr_keyword">if</strong> ((X509Security.X509_V3_TYPE.equals(type)
+<a name="200" href="#200">200</a> || PKIPathSecurity.getType().equals(type))) {
+<a name="201" href="#201">201</a> <em class="jxr_comment">//</em>
+<a name="202" href="#202">202</a> <em class="jxr_comment">// Add the WSSE/WSU namespaces to the element for C14n</em>
+<a name="203" href="#203">203</a> <em class="jxr_comment">//</em>
+<a name="204" href="#204">204</a> WSSecurityUtil.setNamespace(
+<a name="205" href="#205">205</a> dereferencedToken, WSConstants.WSSE_NS, WSConstants.WSSE_PREFIX
+<a name="206" href="#206">206</a> );
+<a name="207" href="#207">207</a> WSSecurityUtil.setNamespace(
+<a name="208" href="#208">208</a> dereferencedToken, WSConstants.WSU_NS, WSConstants.WSU_PREFIX
+<a name="209" href="#209">209</a> );
+<a name="210" href="#210">210</a> }
+<a name="211" href="#211">211</a> }
+<a name="212" href="#212">212</a>
+<a name="213" href="#213">213</a> <em class="jxr_comment">//</em>
+<a name="214" href="#214">214</a> <em class="jxr_comment">// C14n with specified algorithm. According to WSS Specification.</em>
+<a name="215" href="#215">215</a> <em class="jxr_comment">//</em>
+<a name="216" href="#216">216</a> buf = canon.canonicalizeSubtree(dereferencedToken, <span class="jxr_string">"#default"</span>);
+<a name="217" href="#217">217</a> <strong class="jxr_keyword">if</strong> (doDebug) {
+<a name="218" href="#218">218</a> bos = <strong class="jxr_keyword">new</strong> ByteArrayOutputStream(buf.length);
+<a name="219" href="#219">219</a> bos.write(buf, 0, buf.length);
+<a name="220" href="#220">220</a> log.debug(<span class="jxr_string">"after c14n: "</span> + bos.toString());
+<a name="221" href="#221">221</a> }
+<a name="222" href="#222">222</a>
+<a name="223" href="#223">223</a> <em class="jxr_comment">//</em>
+<a name="224" href="#224">224</a> <em class="jxr_comment">// Alert: Hacks ahead According to WSS spec an Apex node must</em>
+<a name="225" href="#225">225</a> <em class="jxr_comment">// contain a default namespace. If none is availabe in the first</em>
+<a name="226" href="#226">226</a> <em class="jxr_comment">// node of the c14n output (this is the apex element) then we do</em>
+<a name="227" href="#227">227</a> <em class="jxr_comment">// some editing to insert an empty default namespace</em>
+<a name="228" href="#228">228</a> <em class="jxr_comment">// </em>
+<a name="229" href="#229">229</a> <em class="jxr_comment">// TODO: Rework theses hacks after c14n was updated and can be</em>
+<a name="230" href="#230">230</a> <em class="jxr_comment">// instructed to insert empty default namespace if required</em>
+<a name="231" href="#231">231</a> <em class="jxr_comment">//</em>
+<a name="232" href="#232">232</a> <em class="jxr_comment">// If the problem with c14n method is solved then just do:</em>
+<a name="233" href="#233">233</a> <em class="jxr_comment">// return new XMLSignatureInput(buf);</em>
+<a name="234" href="#234">234</a>
+<a name="235" href="#235">235</a> <em class="jxr_comment">// start of HACK</em>
+<a name="236" href="#236">236</a> StringBuilder bf = <strong class="jxr_keyword">new</strong> StringBuilder(<strong class="jxr_keyword">new</strong> String(buf));
+<a name="237" href="#237">237</a> String bf1 = bf.toString();
+<a name="238" href="#238">238</a>
<a name="239" href="#239">239</a> <em class="jxr_comment">//</em>
-<a name="240" href="#240">240</a> <em class="jxr_comment">// Lookup the default namespace</em>
+<a name="240" href="#240">240</a> <em class="jxr_comment">// Find start and end of first element <....>, this is the Apex node</em>
<a name="241" href="#241">241</a> <em class="jxr_comment">//</em>
-<a name="242" href="#242">242</a> <strong class="jxr_keyword">int</strong> idx = bf1.indexOf(<span class="jxr_string">"xmlns="</span>);
+<a name="242" href="#242">242</a> <strong class="jxr_keyword">int</strong> gt = bf1.indexOf(<span class="jxr_string">">"</span>);
<a name="243" href="#243">243</a> <em class="jxr_comment">//</em>
-<a name="244" href="#244">244</a> <em class="jxr_comment">// If none found or if it is outside of this (Apex) element look for</em>
-<a name="245" href="#245">245</a> <em class="jxr_comment">// first blank in, insert default namespace there (this is the</em>
-<a name="246" href="#246">246</a> <em class="jxr_comment">// correct place according to c14n specification)</em>
+<a name="244" href="#244">244</a> <em class="jxr_comment">// Lookup the default namespace</em>
+<a name="245" href="#245">245</a> <em class="jxr_comment">//</em>
+<a name="246" href="#246">246</a> <strong class="jxr_keyword">int</strong> idx = bf1.indexOf(<span class="jxr_string">"xmlns="</span>);
<a name="247" href="#247">247</a> <em class="jxr_comment">//</em>
-<a name="248" href="#248">248</a> <strong class="jxr_keyword">if</strong> (idx < 0 || idx > gt) {
-<a name="249" href="#249">249</a> idx = bf1.indexOf(<span class="jxr_string">" "</span>);
-<a name="250" href="#250">250</a> bf.insert(idx + 1, <span class="jxr_string">"xmlns=\"\" "</span>);
-<a name="251" href="#251">251</a> bf1 = bf.toString();
-<a name="252" href="#252">252</a> }
-<a name="253" href="#253">253</a> <strong class="jxr_keyword">if</strong> (doDebug) {
-<a name="254" href="#254">254</a> log.debug(<span class="jxr_string">"last result: "</span>);
-<a name="255" href="#255">255</a> log.debug(bf1);
+<a name="248" href="#248">248</a> <em class="jxr_comment">// If none found or if it is outside of this (Apex) element look for</em>
+<a name="249" href="#249">249</a> <em class="jxr_comment">// first blank in, insert default namespace there (this is the</em>
+<a name="250" href="#250">250</a> <em class="jxr_comment">// correct place according to c14n specification)</em>
+<a name="251" href="#251">251</a> <em class="jxr_comment">//</em>
+<a name="252" href="#252">252</a> <strong class="jxr_keyword">if</strong> (idx < 0 || idx > gt) {
+<a name="253" href="#253">253</a> idx = bf1.indexOf(<span class="jxr_string">" "</span>);
+<a name="254" href="#254">254</a> bf.insert(idx + 1, <span class="jxr_string">"xmlns=\"\" "</span>);
+<a name="255" href="#255">255</a> bf1 = bf.toString();
<a name="256" href="#256">256</a> }
-<a name="257" href="#257">257</a> XMLSignatureInput output = <strong class="jxr_keyword">new</strong> XMLSignatureInput(bf1.getBytes());
-<a name="258" href="#258">258</a> <strong class="jxr_keyword">if</strong> (os != <strong class="jxr_keyword">null</strong>) {
-<a name="259" href="#259">259</a> output.updateOutputStream(os);
-<a name="260" href="#260">260</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
-<a name="261" href="#261">261</a> }
-<a name="262" href="#262">262</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> OctetStreamData(output.getOctetStream());
-<a name="263" href="#263">263</a> } <strong class="jxr_keyword">catch</strong> (Exception ex) {
-<a name="264" href="#264">264</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> TransformException(ex);
-<a name="265" href="#265">265</a> }
-<a name="266" href="#266">266</a> }
-<a name="267" href="#267">267</a>
-<a name="268" href="#268">268</a>
-<a name="269" href="#269">269</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> isFeatureSupported(String feature) {
-<a name="270" href="#270">270</a> <strong class="jxr_keyword">if</strong> (feature == <strong class="jxr_keyword">null</strong>) {
-<a name="271" href="#271">271</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> NullPointerException();
-<a name="272" href="#272">272</a> } <strong class="jxr_keyword">else</strong> {
-<a name="273" href="#273">273</a> <strong class="jxr_keyword">return</strong> false;
-<a name="274" href="#274">274</a> }
-<a name="275" href="#275">275</a> }
-<a name="276" href="#276">276</a>
-<a name="277" href="#277">277</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> appendChild(Node parent, Node child) {
-<a name="278" href="#278">278</a> Document ownerDoc = <strong class="jxr_keyword">null</strong>;
-<a name="279" href="#279">279</a> <strong class="jxr_keyword">if</strong> (parent.getNodeType() == Node.DOCUMENT_NODE) {
-<a name="280" href="#280">280</a> ownerDoc = (Document)parent;
-<a name="281" href="#281">281</a> } <strong class="jxr_keyword">else</strong> {
-<a name="282" href="#282">282</a> ownerDoc = parent.getOwnerDocument();
-<a name="283" href="#283">283</a> }
-<a name="284" href="#284">284</a> <strong class="jxr_keyword">if</strong> (child.getOwnerDocument() != ownerDoc) {
-<a name="285" href="#285">285</a> parent.appendChild(ownerDoc.importNode(child, <strong class="jxr_keyword">true</strong>));
-<a name="286" href="#286">286</a> } <strong class="jxr_keyword">else</strong> {
-<a name="287" href="#287">287</a> parent.appendChild(child);
-<a name="288" href="#288">288</a> }
-<a name="289" href="#289">289</a> }
-<a name="290" href="#290">290</a>
-<a name="291" href="#291">291</a> }
+<a name="257" href="#257">257</a> <strong class="jxr_keyword">if</strong> (doDebug) {
+<a name="258" href="#258">258</a> log.debug(<span class="jxr_string">"last result: "</span>);
+<a name="259" href="#259">259</a> log.debug(bf1);
+<a name="260" href="#260">260</a> }
+<a name="261" href="#261">261</a> XMLSignatureInput output = <strong class="jxr_keyword">new</strong> XMLSignatureInput(bf1.getBytes());
+<a name="262" href="#262">262</a> <strong class="jxr_keyword">if</strong> (os != <strong class="jxr_keyword">null</strong>) {
+<a name="263" href="#263">263</a> output.updateOutputStream(os);
+<a name="264" href="#264">264</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">null</strong>;
+<a name="265" href="#265">265</a> }
+<a name="266" href="#266">266</a> <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> OctetStreamData(output.getOctetStream());
+<a name="267" href="#267">267</a> } <strong class="jxr_keyword">catch</strong> (Exception ex) {
+<a name="268" href="#268">268</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> TransformException(ex);
+<a name="269" href="#269">269</a> }
+<a name="270" href="#270">270</a> }
+<a name="271" href="#271">271</a>
+<a name="272" href="#272">272</a>
+<a name="273" href="#273">273</a> <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong> isFeatureSupported(String feature) {
+<a name="274" href="#274">274</a> <strong class="jxr_keyword">if</strong> (feature == <strong class="jxr_keyword">null</strong>) {
+<a name="275" href="#275">275</a> <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> NullPointerException();
+<a name="276" href="#276">276</a> } <strong class="jxr_keyword">else</strong> {
+<a name="277" href="#277">277</a> <strong class="jxr_keyword">return</strong> false;
+<a name="278" href="#278">278</a> }
+<a name="279" href="#279">279</a> }
+<a name="280" href="#280">280</a>
+<a name="281" href="#281">281</a> <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">void</strong> appendChild(Node parent, Node child) {
+<a name="282" href="#282">282</a> Document ownerDoc = <strong class="jxr_keyword">null</strong>;
+<a name="283" href="#283">283</a> <strong class="jxr_keyword">if</strong> (parent.getNodeType() == Node.DOCUMENT_NODE) {
+<a name="284" href="#284">284</a> ownerDoc = (Document)parent;
+<a name="285" href="#285">285</a> } <strong class="jxr_keyword">else</strong> {
+<a name="286" href="#286">286</a> ownerDoc = parent.getOwnerDocument();
+<a name="287" href="#287">287</a> }
+<a name="288" href="#288">288</a> <strong class="jxr_keyword">if</strong> (child.getOwnerDocument() != ownerDoc) {
+<a name="289" href="#289">289</a> parent.appendChild(ownerDoc.importNode(child, <strong class="jxr_keyword">true</strong>));
+<a name="290" href="#290">290</a> } <strong class="jxr_keyword">else</strong> {
+<a name="291" href="#291">291</a> parent.appendChild(child);
+<a name="292" href="#292">292</a> }
+<a name="293" href="#293">293</a> }
+<a name="294" href="#294">294</a>
+<a name="295" href="#295">295</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/transform/package-frame.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/transform/package-frame.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/transform/package-frame.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/transform/package-frame.html Tue Dec 6 10:23:54 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.3 Reference Package org.apache.ws.security.transform</title>
+ <title>WSS4J 1.6.4 Reference Package org.apache.ws.security.transform</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>
Modified: webservices/wss4j/site/xref/org/apache/ws/security/transform/package-summary.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref/org/apache/ws/security/transform/package-summary.html?rev=1210847&r1=1210846&r2=1210847&view=diff
==============================================================================
--- webservices/wss4j/site/xref/org/apache/ws/security/transform/package-summary.html (original)
+++ webservices/wss4j/site/xref/org/apache/ws/security/transform/package-summary.html Tue Dec 6 10:23:54 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.3 Reference Package org.apache.ws.security.transform</title>
+ <title>WSS4J 1.6.4 Reference Package org.apache.ws.security.transform</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="style" />
</head>
<body>