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 2010/11/30 12:10:41 UTC

svn commit: r1040461 [13/28] - in /webservices/wss4j/site: ./ apidocs/ apidocs/org/apache/ws/axis/security/ apidocs/org/apache/ws/axis/security/class-use/ apidocs/org/apache/ws/axis/security/handler/ apidocs/org/apache/ws/axis/security/handler/class-us...

Modified: webservices/wss4j/site/xref-test/wssec/TestWSSecurityNew5.html
URL: http://svn.apache.org/viewvc/webservices/wss4j/site/xref-test/wssec/TestWSSecurityNew5.html?rev=1040461&r1=1040460&r2=1040461&view=diff
==============================================================================
--- webservices/wss4j/site/xref-test/wssec/TestWSSecurityNew5.html (original)
+++ webservices/wss4j/site/xref-test/wssec/TestWSSecurityNew5.html Tue Nov 30 11:10:26 2010
@@ -48,319 +48,319 @@
 <a name="38" href="#38">38</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.handler.WSHandlerConstants;
 <a name="39" href="#39">39</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.message.WSSecUsernameToken;
 <a name="40" href="#40">40</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.message.WSSecHeader;
-<a name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.util.Base64;
-<a name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Document;
-<a name="43" href="#43">43</a>  
-<a name="44" href="#44">44</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.Callback;
-<a name="45" href="#45">45</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.CallbackHandler;
-<a name="46" href="#46">46</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.UnsupportedCallbackException;
-<a name="47" href="#47">47</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayInputStream;
-<a name="48" href="#48">48</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
-<a name="49" href="#49">49</a>  <strong class="jxr_keyword">import</strong> java.io.InputStream;
-<a name="50" href="#50">50</a>  <strong class="jxr_keyword">import</strong> java.security.MessageDigest;
-<a name="51" href="#51">51</a>  
-<a name="52" href="#52">52</a>  
-<a name="53" href="#53">53</a>  <em class="jxr_javadoccomment">/**</em>
-<a name="54" href="#54">54</a>  <em class="jxr_javadoccomment"> * WS-Security Test Case for UsernameTokens.</em>
-<a name="55" href="#55">55</a>  <em class="jxr_javadoccomment"> * </em>
-<a name="56" href="#56">56</a>  <em class="jxr_javadoccomment"> * @author Davanum Srinivas (dims@yahoo.com)</em>
-<a name="57" href="#57">57</a>  <em class="jxr_javadoccomment"> */</em>
-<a name="58" href="#58">58</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> TestWSSecurityNew5 <strong class="jxr_keyword">extends</strong> TestCase implements CallbackHandler {
-<a name="59" href="#59">59</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestWSSecurityNew5.<strong class="jxr_keyword">class</strong>);
-<a name="60" href="#60">60</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SOAPMSG = 
-<a name="61" href="#61">61</a>          <span class="jxr_string">"&lt;?xml version=\&quot;1.0\&quot; encoding=\&quot;UTF-8\&quot;?&gt;"</span> 
-<a name="62" href="#62">62</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Envelope "</span>
-<a name="63" href="#63">63</a>          +   <span class="jxr_string">"xmlns:SOAP-ENV=\&quot;http://schemas.xmlsoap.org/soap/envelope/\&quot; "</span>
-<a name="64" href="#64">64</a>          +   <span class="jxr_string">"xmlns:xsd=\&quot;http://www.w3.org/2001/XMLSchema\&quot; "</span>
-<a name="65" href="#65">65</a>          +   <span class="jxr_string">"xmlns:xsi=\&quot;http://www.w3.org/2001/XMLSchema-instance\&quot;&gt;"</span> 
-<a name="66" href="#66">66</a>          +   <span class="jxr_string">"&lt;SOAP-ENV:Body&gt;"</span> 
-<a name="67" href="#67">67</a>          +       <span class="jxr_string">"&lt;add xmlns=\&quot;http://ws.apache.org/counter/counter_port_type\&quot;&gt;"</span> 
-<a name="68" href="#68">68</a>          +           <span class="jxr_string">"&lt;value xmlns=\&quot;\&quot;&gt;15&lt;/value&gt;"</span> 
-<a name="69" href="#69">69</a>          +       <span class="jxr_string">"&lt;/add&gt;"</span> 
-<a name="70" href="#70">70</a>          +   <span class="jxr_string">"&lt;/SOAP-ENV:Body&gt;"</span> 
-<a name="71" href="#71">71</a>          + <span class="jxr_string">"&lt;/SOAP-ENV:Envelope&gt;"</span>;
-<a name="72" href="#72">72</a>  
-<a name="73" href="#73">73</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SOAPUTMSG = 
-<a name="74" href="#74">74</a>          <span class="jxr_string">"&lt;?xml version=\&quot;1.0\&quot; encoding=\&quot;UTF-8\&quot;?&gt;"</span> 
-<a name="75" href="#75">75</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Envelope xmlns:SOAP-ENV=\&quot;http://schemas.xmlsoap.org/soap/envelope/\&quot; "</span>
-<a name="76" href="#76">76</a>          + <span class="jxr_string">"xmlns:xsd=\&quot;http://www.w3.org/2001/XMLSchema\&quot; "</span>
-<a name="77" href="#77">77</a>          + <span class="jxr_string">"xmlns:xsi=\&quot;http://www.w3.org/2001/XMLSchema-instance\&quot;&gt;"</span>
-<a name="78" href="#78">78</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Header&gt;"</span>
-<a name="79" href="#79">79</a>          + <span class="jxr_string">"&lt;wsse:Security SOAP-ENV:mustUnderstand=\&quot;1\&quot; "</span>
-<a name="80" href="#80">80</a>          + <span class="jxr_string">"xmlns:wsse=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd\&quot;&gt;"</span>
-<a name="81" href="#81">81</a>          + <span class="jxr_string">"&lt;wsse:UsernameToken wsu:Id=\&quot;UsernameToken-29477163\&quot; xmlns:wsu=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\&quot;&gt;"</span>
-<a name="82" href="#82">82</a>          + <span class="jxr_string">"&lt;wsse:Username&gt;wernerd&lt;/wsse:Username&gt;"</span>
-<a name="83" href="#83">83</a>          + <span class="jxr_string">"&lt;wsse:Password&gt;verySecret&lt;/wsse:Password&gt;"</span>
-<a name="84" href="#84">84</a>          + <span class="jxr_string">"&lt;/wsse:UsernameToken&gt;&lt;/wsse:Security&gt;&lt;/SOAP-ENV:Header&gt;"</span>
-<a name="85" href="#85">85</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Body&gt;"</span> 
-<a name="86" href="#86">86</a>          + <span class="jxr_string">"&lt;add xmlns=\&quot;http://ws.apache.org/counter/counter_port_type\&quot;&gt;"</span> 
-<a name="87" href="#87">87</a>          + <span class="jxr_string">"&lt;value xmlns=\&quot;\&quot;&gt;15&lt;/value&gt;"</span> + <span class="jxr_string">"&lt;/add&gt;"</span> 
-<a name="88" href="#88">88</a>          + <span class="jxr_string">"&lt;/SOAP-ENV:Body&gt;\r\n       \r\n"</span> + <span class="jxr_string">"&lt;/SOAP-ENV:Envelope&gt;"</span>;
-<a name="89" href="#89">89</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String EMPTY_PASSWORD_MSG =
-<a name="90" href="#90">90</a>          <span class="jxr_string">"&lt;?xml version=\&quot;1.0\&quot; encoding=\&quot;UTF-8\&quot;?&gt;"</span> 
-<a name="91" href="#91">91</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Envelope xmlns:SOAP-ENV=\&quot;http://schemas.xmlsoap.org/soap/envelope/\&quot; "</span>
-<a name="92" href="#92">92</a>          + <span class="jxr_string">"xmlns:xsd=\&quot;http://www.w3.org/2001/XMLSchema\&quot; "</span>
-<a name="93" href="#93">93</a>          + <span class="jxr_string">"xmlns:xsi=\&quot;http://www.w3.org/2001/XMLSchema-instance\&quot;&gt;"</span>
-<a name="94" href="#94">94</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Header&gt;"</span>
-<a name="95" href="#95">95</a>          + <span class="jxr_string">"&lt;wsse:Security SOAP-ENV:mustUnderstand=\&quot;1\&quot; "</span>
-<a name="96" href="#96">96</a>          + <span class="jxr_string">"xmlns:wsse=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd\&quot;&gt;"</span>
-<a name="97" href="#97">97</a>          + <span class="jxr_string">"&lt;wsse:UsernameToken wsu:Id=\&quot;UsernameToken-1\&quot; "</span>
-<a name="98" href="#98">98</a>          + <span class="jxr_string">"xmlns:wsse=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd\&quot; "</span>
-<a name="99" href="#99">99</a>          + <span class="jxr_string">"xmlns:wsu=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\&quot;&gt;"</span>
-<a name="100" href="#100">100</a>         + <span class="jxr_string">"&lt;wsse:Username&gt;wernerd&lt;/wsse:Username&gt;"</span>
-<a name="101" href="#101">101</a>         + <span class="jxr_string">"&lt;wsse:Password Type=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText\&quot;/&gt;"</span>
-<a name="102" href="#102">102</a>         + <span class="jxr_string">"&lt;/wsse:UsernameToken&gt;&lt;/wsse:Security&gt;&lt;/SOAP-ENV:Header&gt;"</span>
-<a name="103" href="#103">103</a>         + <span class="jxr_string">"&lt;SOAP-ENV:Body&gt;"</span> 
-<a name="104" href="#104">104</a>         + <span class="jxr_string">"&lt;add xmlns=\&quot;http://ws.apache.org/counter/counter_port_type\&quot;&gt;"</span> 
-<a name="105" href="#105">105</a>         + <span class="jxr_string">"&lt;value xmlns=\&quot;\&quot;&gt;15&lt;/value&gt;"</span> + <span class="jxr_string">"&lt;/add&gt;"</span> 
-<a name="106" href="#106">106</a>         + <span class="jxr_string">"&lt;/SOAP-ENV:Body&gt;\r\n       \r\n"</span> + <span class="jxr_string">"&lt;/SOAP-ENV:Envelope&gt;"</span>;
-<a name="107" href="#107">107</a>     
-<a name="108" href="#108">108</a>     <strong class="jxr_keyword">private</strong> WSSecurityEngine secEngine = <strong class="jxr_keyword">new</strong> WSSecurityEngine();
-<a name="109" href="#109">109</a>     <strong class="jxr_keyword">private</strong> MessageContext msgContext;
-<a name="110" href="#110">110</a>     <strong class="jxr_keyword">private</strong> SOAPEnvelope unsignedEnvelope;
-<a name="111" href="#111">111</a> 
-<a name="112" href="#112">112</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="113" href="#113">113</a> <em class="jxr_javadoccomment">     * TestWSSecurity constructor</em>
-<a name="114" href="#114">114</a> <em class="jxr_javadoccomment">     * </em>
-<a name="115" href="#115">115</a> <em class="jxr_javadoccomment">     * @param name name of the test</em>
-<a name="116" href="#116">116</a> <em class="jxr_javadoccomment">     */</em>
-<a name="117" href="#117">117</a>     <strong class="jxr_keyword">public</strong> TestWSSecurityNew5(String name) {
-<a name="118" href="#118">118</a>         <strong class="jxr_keyword">super</strong>(name);
-<a name="119" href="#119">119</a>     }
-<a name="120" href="#120">120</a> 
-<a name="121" href="#121">121</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="122" href="#122">122</a> <em class="jxr_javadoccomment">     * JUnit suite</em>
-<a name="123" href="#123">123</a> <em class="jxr_javadoccomment">     * </em>
-<a name="124" href="#124">124</a> <em class="jxr_javadoccomment">     * @return a junit test suite</em>
-<a name="125" href="#125">125</a> <em class="jxr_javadoccomment">     */</em>
-<a name="126" href="#126">126</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Test suite() {
-<a name="127" href="#127">127</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> TestSuite(TestWSSecurityNew5.<strong class="jxr_keyword">class</strong>);
-<a name="128" href="#128">128</a>     }
-<a name="129" href="#129">129</a> 
-<a name="130" href="#130">130</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="131" href="#131">131</a> <em class="jxr_javadoccomment">     * Setup method</em>
-<a name="132" href="#132">132</a> <em class="jxr_javadoccomment">     * </em>
-<a name="133" href="#133">133</a> <em class="jxr_javadoccomment">     * @throws java.lang.Exception Thrown when there is a problem in setup</em>
-<a name="134" href="#134">134</a> <em class="jxr_javadoccomment">     */</em>
-<a name="135" href="#135">135</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setUp() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="136" href="#136">136</a>         AxisClient tmpEngine = <strong class="jxr_keyword">new</strong> AxisClient(<strong class="jxr_keyword">new</strong> NullProvider());
-<a name="137" href="#137">137</a>         msgContext = <strong class="jxr_keyword">new</strong> MessageContext(tmpEngine);
-<a name="138" href="#138">138</a>         unsignedEnvelope = getSOAPEnvelope();
-<a name="139" href="#139">139</a>     }
-<a name="140" href="#140">140</a> 
-<a name="141" href="#141">141</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="142" href="#142">142</a> <em class="jxr_javadoccomment">     * Constructs a soap envelope</em>
-<a name="143" href="#143">143</a> <em class="jxr_javadoccomment">     * </em>
-<a name="144" href="#144">144</a> <em class="jxr_javadoccomment">     * @return soap envelope</em>
-<a name="145" href="#145">145</a> <em class="jxr_javadoccomment">     * @throws java.lang.Exception if there is any problem constructing the soap envelope</em>
-<a name="146" href="#146">146</a> <em class="jxr_javadoccomment">     */</em>
-<a name="147" href="#147">147</a>     <strong class="jxr_keyword">protected</strong> SOAPEnvelope getSOAPEnvelope() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="148" href="#148">148</a>         InputStream in = <strong class="jxr_keyword">new</strong> ByteArrayInputStream(SOAPMSG.getBytes());
-<a name="149" href="#149">149</a>         Message msg = <strong class="jxr_keyword">new</strong> Message(in);
-<a name="150" href="#150">150</a>         msg.setMessageContext(msgContext);
-<a name="151" href="#151">151</a>         <strong class="jxr_keyword">return</strong> msg.getSOAPEnvelope();
-<a name="152" href="#152">152</a>     }
-<a name="153" href="#153">153</a> 
-<a name="154" href="#154">154</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="155" href="#155">155</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with password Digest to a WS-Security envelope</em>
-<a name="156" href="#156">156</a> <em class="jxr_javadoccomment">     */</em>
-<a name="157" href="#157">157</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenDigest() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="158" href="#158">158</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="159" href="#159">159</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">"verySecret"</span>);
-<a name="160" href="#160">160</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Digest...."</span>);
-<a name="161" href="#161">161</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="162" href="#162">162</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="163" href="#163">163</a>         secHeader.insertSecurityHeader(doc);
-<a name="164" href="#164">164</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="165" href="#165">165</a> 
-<a name="166" href="#166">166</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="167" href="#167">167</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Digest:"</span>);
-<a name="168" href="#168">168</a>             String outputString = 
-<a name="169" href="#169">169</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="170" href="#170">170</a>             LOG.debug(outputString);
-<a name="171" href="#171">171</a>         }
-<a name="172" href="#172">172</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Digest...."</span>);
-<a name="173" href="#173">173</a>         verify(signedDoc);
-<a name="174" href="#174">174</a>     }
-<a name="175" href="#175">175</a>     
-<a name="176" href="#176">176</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="177" href="#177">177</a> <em class="jxr_javadoccomment">     * Test that a bad username with password digest does not leak whether the username</em>
-<a name="178" href="#178">178</a> <em class="jxr_javadoccomment">     * is valid or not - see WSS-141.</em>
-<a name="179" href="#179">179</a> <em class="jxr_javadoccomment">     */</em>
-<a name="180" href="#180">180</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenBadUsername() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="181" href="#181">181</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="182" href="#182">182</a>         builder.setUserInfo(<span class="jxr_string">"badusername"</span>, <span class="jxr_string">"verySecret"</span>);
-<a name="183" href="#183">183</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Digest...."</span>);
-<a name="184" href="#184">184</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="185" href="#185">185</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="186" href="#186">186</a>         secHeader.insertSecurityHeader(doc);
-<a name="187" href="#187">187</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="188" href="#188">188</a> 
-<a name="189" href="#189">189</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="190" href="#190">190</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Digest:"</span>);
-<a name="191" href="#191">191</a>             String outputString = 
-<a name="192" href="#192">192</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="193" href="#193">193</a>             LOG.debug(outputString);
-<a name="194" href="#194">194</a>         }
-<a name="195" href="#195">195</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Digest...."</span>);
-<a name="196" href="#196">196</a>         <strong class="jxr_keyword">try</strong> {
-<a name="197" href="#197">197</a>             verify(signedDoc);
-<a name="198" href="#198">198</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad username"</span>);
-<a name="199" href="#199">199</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
-<a name="200" href="#200">200</a>             String message = ex.getMessage();
-<a name="201" href="#201">201</a>             assertTrue(message.indexOf(<span class="jxr_string">"badusername"</span>) == -1);
-<a name="202" href="#202">202</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
-<a name="203" href="#203">203</a>             <em class="jxr_comment">// expected</em>
-<a name="204" href="#204">204</a>         }
-<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">     * Test that adds a UserNameToken with a bad password Digest to a WS-Security envelope</em>
-<a name="209" href="#209">209</a> <em class="jxr_javadoccomment">     */</em>
-<a name="210" href="#210">210</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenBadDigest() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="211" href="#211">211</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="212" href="#212">212</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">"verySecre"</span>);
-<a name="213" href="#213">213</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Digest...."</span>);
-<a name="214" href="#214">214</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="215" href="#215">215</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="216" href="#216">216</a>         secHeader.insertSecurityHeader(doc);
-<a name="217" href="#217">217</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="218" href="#218">218</a> 
-<a name="219" href="#219">219</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="220" href="#220">220</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Digest:"</span>);
-<a name="221" href="#221">221</a>             String outputString = 
-<a name="222" href="#222">222</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="223" href="#223">223</a>             LOG.debug(outputString);
-<a name="224" href="#224">224</a>         }
-<a name="225" href="#225">225</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Digest...."</span>);
-<a name="226" href="#226">226</a>         <strong class="jxr_keyword">try</strong> {
-<a name="227" href="#227">227</a>             verify(signedDoc);
-<a name="228" href="#228">228</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad password digest"</span>);
-<a name="229" href="#229">229</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
-<a name="230" href="#230">230</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
-<a name="231" href="#231">231</a>             <em class="jxr_comment">// expected</em>
-<a name="232" href="#232">232</a>         }
-<a name="233" href="#233">233</a>     }
-<a name="234" href="#234">234</a> 
-<a name="235" href="#235">235</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="236" href="#236">236</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with password text to a WS-Security envelope</em>
-<a name="237" href="#237">237</a> <em class="jxr_javadoccomment">     */</em>
-<a name="238" href="#238">238</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenText() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="239" href="#239">239</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="240" href="#240">240</a>         builder.setPasswordType(WSConstants.PASSWORD_TEXT);
-<a name="241" href="#241">241</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">"verySecret"</span>);
-<a name="242" href="#242">242</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Text...."</span>);
-<a name="243" href="#243">243</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="244" href="#244">244</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="245" href="#245">245</a>         secHeader.insertSecurityHeader(doc);
-<a name="246" href="#246">246</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="247" href="#247">247</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="248" href="#248">248</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Text:"</span>);
-<a name="249" href="#249">249</a>             String outputString = 
-<a name="250" href="#250">250</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="251" href="#251">251</a>             LOG.debug(outputString);
-<a name="252" href="#252">252</a>         }
-<a name="253" href="#253">253</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Text...."</span>);
-<a name="254" href="#254">254</a>         verify(signedDoc);
-<a name="255" href="#255">255</a>     }
-<a name="256" href="#256">256</a>     
-<a name="257" href="#257">257</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="258" href="#258">258</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with a digested password but with type of</em>
-<a name="259" href="#259">259</a> <em class="jxr_javadoccomment">     * password test.</em>
-<a name="260" href="#260">260</a> <em class="jxr_javadoccomment">     */</em>
-<a name="261" href="#261">261</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenDigestText() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="262" href="#262">262</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="263" href="#263">263</a>         builder.setPasswordType(WSConstants.PASSWORD_TEXT);
-<a name="264" href="#264">264</a>         byte[] password = <span class="jxr_string">"verySecret"</span>.getBytes();
-<a name="265" href="#265">265</a>         MessageDigest sha = MessageDigest.getInstance(<span class="jxr_string">"MD5"</span>);
-<a name="266" href="#266">266</a>         sha.reset();
-<a name="267" href="#267">267</a>         sha.update(password);
-<a name="268" href="#268">268</a>         String passwdDigest = Base64.encode(sha.digest());
-<a name="269" href="#269">269</a>         
-<a name="270" href="#270">270</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, passwdDigest);
-<a name="271" href="#271">271</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Text...."</span>);
-<a name="272" href="#272">272</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="273" href="#273">273</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="274" href="#274">274</a>         secHeader.insertSecurityHeader(doc);
-<a name="275" href="#275">275</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="276" href="#276">276</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="277" href="#277">277</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Text:"</span>);
-<a name="278" href="#278">278</a>             String outputString = 
-<a name="279" href="#279">279</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="280" href="#280">280</a>             LOG.debug(outputString);
-<a name="281" href="#281">281</a>         }
-<a name="282" href="#282">282</a>     }
-<a name="283" href="#283">283</a>     
-<a name="284" href="#284">284</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="285" href="#285">285</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with (bad) password text to a WS-Security envelope</em>
-<a name="286" href="#286">286</a> <em class="jxr_javadoccomment">     */</em>
-<a name="287" href="#287">287</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenBadText() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="288" href="#288">288</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="289" href="#289">289</a>         builder.setPasswordType(WSConstants.PASSWORD_TEXT);
-<a name="290" href="#290">290</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">"verySecre"</span>);
-<a name="291" href="#291">291</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Text...."</span>);
-<a name="292" href="#292">292</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="293" href="#293">293</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="294" href="#294">294</a>         secHeader.insertSecurityHeader(doc);
-<a name="295" href="#295">295</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="296" href="#296">296</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="297" href="#297">297</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Text:"</span>);
-<a name="298" href="#298">298</a>             String outputString = 
-<a name="299" href="#299">299</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="300" href="#300">300</a>             LOG.debug(outputString);
-<a name="301" href="#301">301</a>         }
-<a name="302" href="#302">302</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Text...."</span>);
-<a name="303" href="#303">303</a>         
-<a name="304" href="#304">304</a>         <strong class="jxr_keyword">try</strong> {
-<a name="305" href="#305">305</a>             verify(signedDoc);
-<a name="306" href="#306">306</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad password text"</span>);
-<a name="307" href="#307">307</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
-<a name="308" href="#308">308</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
-<a name="309" href="#309">309</a>             <em class="jxr_comment">// expected</em>
-<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>     <em class="jxr_javadoccomment">/**</em>
-<a name="314" href="#314">314</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with no password type to a WS-Security envelope</em>
-<a name="315" href="#315">315</a> <em class="jxr_javadoccomment">     * See WSS-152 - https://issues.apache.org/jira/browse/WSS-152</em>
-<a name="316" href="#316">316</a> <em class="jxr_javadoccomment">     * "Problem with processing Username Tokens with no password type"</em>
-<a name="317" href="#317">317</a> <em class="jxr_javadoccomment">     * The 1.1 spec states that the password type is optional and defaults to password text, </em>
-<a name="318" href="#318">318</a> <em class="jxr_javadoccomment">     * and so we should handle an incoming Username Token accordingly.</em>
-<a name="319" href="#319">319</a> <em class="jxr_javadoccomment">     */</em>
-<a name="320" href="#320">320</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenNoPasswordType() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="321" href="#321">321</a>         InputStream in = <strong class="jxr_keyword">new</strong> ByteArrayInputStream(SOAPUTMSG.getBytes());
-<a name="322" href="#322">322</a>         Message msg = <strong class="jxr_keyword">new</strong> Message(in);
-<a name="323" href="#323">323</a>         msg.setMessageContext(msgContext);
-<a name="324" href="#324">324</a>         SOAPEnvelope utEnvelope = msg.getSOAPEnvelope();
-<a name="325" href="#325">325</a>         Document doc = utEnvelope.getAsDocument();
-<a name="326" href="#326">326</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="327" href="#327">327</a>             String outputString = 
-<a name="328" href="#328">328</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
-<a name="329" href="#329">329</a>             LOG.debug(outputString);
-<a name="330" href="#330">330</a>         }
-<a name="331" href="#331">331</a>         verify(doc);
-<a name="332" href="#332">332</a>     }
-<a name="333" href="#333">333</a>     
-<a name="334" href="#334">334</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="335" href="#335">335</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with no password</em>
-<a name="336" href="#336">336</a> <em class="jxr_javadoccomment">     */</em>
-<a name="337" href="#337">337</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenNoPassword() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="338" href="#338">338</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="339" href="#339">339</a>         builder.setPasswordType(<strong class="jxr_keyword">null</strong>);
-<a name="340" href="#340">340</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <strong class="jxr_keyword">null</strong>);
-<a name="341" href="#341">341</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken with no password...."</span>);
-<a name="342" href="#342">342</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="343" href="#343">343</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="344" href="#344">344</a>         secHeader.insertSecurityHeader(doc);
-<a name="345" href="#345">345</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="346" href="#346">346</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="347" href="#347">347</a>             String outputString = 
-<a name="348" href="#348">348</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="349" href="#349">349</a>             LOG.debug(outputString);
-<a name="350" href="#350">350</a>         }
+<a name="41" href="#41">41</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.message.token.UsernameToken;
+<a name="42" href="#42">42</a>  <strong class="jxr_keyword">import</strong> org.apache.ws.security.util.Base64;
+<a name="43" href="#43">43</a>  <strong class="jxr_keyword">import</strong> org.w3c.dom.Document;
+<a name="44" href="#44">44</a>  
+<a name="45" href="#45">45</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.Callback;
+<a name="46" href="#46">46</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.CallbackHandler;
+<a name="47" href="#47">47</a>  <strong class="jxr_keyword">import</strong> javax.security.auth.callback.UnsupportedCallbackException;
+<a name="48" href="#48">48</a>  <strong class="jxr_keyword">import</strong> java.io.ByteArrayInputStream;
+<a name="49" href="#49">49</a>  <strong class="jxr_keyword">import</strong> java.io.IOException;
+<a name="50" href="#50">50</a>  <strong class="jxr_keyword">import</strong> java.io.InputStream;
+<a name="51" href="#51">51</a>  <strong class="jxr_keyword">import</strong> java.security.MessageDigest;
+<a name="52" href="#52">52</a>  <strong class="jxr_keyword">import</strong> java.util.Arrays;
+<a name="53" href="#53">53</a>  
+<a name="54" href="#54">54</a>  
+<a name="55" href="#55">55</a>  <em class="jxr_javadoccomment">/**</em>
+<a name="56" href="#56">56</a>  <em class="jxr_javadoccomment"> * WS-Security Test Case for UsernameTokens.</em>
+<a name="57" href="#57">57</a>  <em class="jxr_javadoccomment"> * </em>
+<a name="58" href="#58">58</a>  <em class="jxr_javadoccomment"> * @author Davanum Srinivas (dims@yahoo.com)</em>
+<a name="59" href="#59">59</a>  <em class="jxr_javadoccomment"> */</em>
+<a name="60" href="#60">60</a>  <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong> TestWSSecurityNew5 <strong class="jxr_keyword">extends</strong> TestCase implements CallbackHandler {
+<a name="61" href="#61">61</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> Log LOG = LogFactory.getLog(TestWSSecurityNew5.<strong class="jxr_keyword">class</strong>);
+<a name="62" href="#62">62</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SOAPMSG = 
+<a name="63" href="#63">63</a>          <span class="jxr_string">"&lt;?xml version=\&quot;1.0\&quot; encoding=\&quot;UTF-8\&quot;?&gt;"</span> 
+<a name="64" href="#64">64</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Envelope "</span>
+<a name="65" href="#65">65</a>          +   <span class="jxr_string">"xmlns:SOAP-ENV=\&quot;http://schemas.xmlsoap.org/soap/envelope/\&quot; "</span>
+<a name="66" href="#66">66</a>          +   <span class="jxr_string">"xmlns:xsd=\&quot;http://www.w3.org/2001/XMLSchema\&quot; "</span>
+<a name="67" href="#67">67</a>          +   <span class="jxr_string">"xmlns:xsi=\&quot;http://www.w3.org/2001/XMLSchema-instance\&quot;&gt;"</span> 
+<a name="68" href="#68">68</a>          +   <span class="jxr_string">"&lt;SOAP-ENV:Body&gt;"</span> 
+<a name="69" href="#69">69</a>          +       <span class="jxr_string">"&lt;add xmlns=\&quot;http://ws.apache.org/counter/counter_port_type\&quot;&gt;"</span> 
+<a name="70" href="#70">70</a>          +           <span class="jxr_string">"&lt;value xmlns=\&quot;\&quot;&gt;15&lt;/value&gt;"</span> 
+<a name="71" href="#71">71</a>          +       <span class="jxr_string">"&lt;/add&gt;"</span> 
+<a name="72" href="#72">72</a>          +   <span class="jxr_string">"&lt;/SOAP-ENV:Body&gt;"</span> 
+<a name="73" href="#73">73</a>          + <span class="jxr_string">"&lt;/SOAP-ENV:Envelope&gt;"</span>;
+<a name="74" href="#74">74</a>  
+<a name="75" href="#75">75</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String SOAPUTMSG = 
+<a name="76" href="#76">76</a>          <span class="jxr_string">"&lt;?xml version=\&quot;1.0\&quot; encoding=\&quot;UTF-8\&quot;?&gt;"</span> 
+<a name="77" href="#77">77</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Envelope xmlns:SOAP-ENV=\&quot;http://schemas.xmlsoap.org/soap/envelope/\&quot; "</span>
+<a name="78" href="#78">78</a>          + <span class="jxr_string">"xmlns:xsd=\&quot;http://www.w3.org/2001/XMLSchema\&quot; "</span>
+<a name="79" href="#79">79</a>          + <span class="jxr_string">"xmlns:xsi=\&quot;http://www.w3.org/2001/XMLSchema-instance\&quot;&gt;"</span>
+<a name="80" href="#80">80</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Header&gt;"</span>
+<a name="81" href="#81">81</a>          + <span class="jxr_string">"&lt;wsse:Security SOAP-ENV:mustUnderstand=\&quot;1\&quot; "</span>
+<a name="82" href="#82">82</a>          + <span class="jxr_string">"xmlns:wsse=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd\&quot;&gt;"</span>
+<a name="83" href="#83">83</a>          + <span class="jxr_string">"&lt;wsse:UsernameToken wsu:Id=\&quot;UsernameToken-29477163\&quot; xmlns:wsu=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\&quot;&gt;"</span>
+<a name="84" href="#84">84</a>          + <span class="jxr_string">"&lt;wsse:Username&gt;wernerd&lt;/wsse:Username&gt;"</span>
+<a name="85" href="#85">85</a>          + <span class="jxr_string">"&lt;wsse:Password&gt;verySecret&lt;/wsse:Password&gt;"</span>
+<a name="86" href="#86">86</a>          + <span class="jxr_string">"&lt;/wsse:UsernameToken&gt;&lt;/wsse:Security&gt;&lt;/SOAP-ENV:Header&gt;"</span>
+<a name="87" href="#87">87</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Body&gt;"</span> 
+<a name="88" href="#88">88</a>          + <span class="jxr_string">"&lt;add xmlns=\&quot;http://ws.apache.org/counter/counter_port_type\&quot;&gt;"</span> 
+<a name="89" href="#89">89</a>          + <span class="jxr_string">"&lt;value xmlns=\&quot;\&quot;&gt;15&lt;/value&gt;"</span> + <span class="jxr_string">"&lt;/add&gt;"</span> 
+<a name="90" href="#90">90</a>          + <span class="jxr_string">"&lt;/SOAP-ENV:Body&gt;\r\n       \r\n"</span> + <span class="jxr_string">"&lt;/SOAP-ENV:Envelope&gt;"</span>;
+<a name="91" href="#91">91</a>      <strong class="jxr_keyword">private</strong> <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">final</strong> String EMPTY_PASSWORD_MSG =
+<a name="92" href="#92">92</a>          <span class="jxr_string">"&lt;?xml version=\&quot;1.0\&quot; encoding=\&quot;UTF-8\&quot;?&gt;"</span> 
+<a name="93" href="#93">93</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Envelope xmlns:SOAP-ENV=\&quot;http://schemas.xmlsoap.org/soap/envelope/\&quot; "</span>
+<a name="94" href="#94">94</a>          + <span class="jxr_string">"xmlns:xsd=\&quot;http://www.w3.org/2001/XMLSchema\&quot; "</span>
+<a name="95" href="#95">95</a>          + <span class="jxr_string">"xmlns:xsi=\&quot;http://www.w3.org/2001/XMLSchema-instance\&quot;&gt;"</span>
+<a name="96" href="#96">96</a>          + <span class="jxr_string">"&lt;SOAP-ENV:Header&gt;"</span>
+<a name="97" href="#97">97</a>          + <span class="jxr_string">"&lt;wsse:Security SOAP-ENV:mustUnderstand=\&quot;1\&quot; "</span>
+<a name="98" href="#98">98</a>          + <span class="jxr_string">"xmlns:wsse=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd\&quot;&gt;"</span>
+<a name="99" href="#99">99</a>          + <span class="jxr_string">"&lt;wsse:UsernameToken wsu:Id=\&quot;UsernameToken-1\&quot; "</span>
+<a name="100" href="#100">100</a>         + <span class="jxr_string">"xmlns:wsse=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd\&quot; "</span>
+<a name="101" href="#101">101</a>         + <span class="jxr_string">"xmlns:wsu=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\&quot;&gt;"</span>
+<a name="102" href="#102">102</a>         + <span class="jxr_string">"&lt;wsse:Username&gt;wernerd&lt;/wsse:Username&gt;"</span>
+<a name="103" href="#103">103</a>         + <span class="jxr_string">"&lt;wsse:Password Type=\&quot;http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText\&quot;/&gt;"</span>
+<a name="104" href="#104">104</a>         + <span class="jxr_string">"&lt;/wsse:UsernameToken&gt;&lt;/wsse:Security&gt;&lt;/SOAP-ENV:Header&gt;"</span>
+<a name="105" href="#105">105</a>         + <span class="jxr_string">"&lt;SOAP-ENV:Body&gt;"</span> 
+<a name="106" href="#106">106</a>         + <span class="jxr_string">"&lt;add xmlns=\&quot;http://ws.apache.org/counter/counter_port_type\&quot;&gt;"</span> 
+<a name="107" href="#107">107</a>         + <span class="jxr_string">"&lt;value xmlns=\&quot;\&quot;&gt;15&lt;/value&gt;"</span> + <span class="jxr_string">"&lt;/add&gt;"</span> 
+<a name="108" href="#108">108</a>         + <span class="jxr_string">"&lt;/SOAP-ENV:Body&gt;\r\n       \r\n"</span> + <span class="jxr_string">"&lt;/SOAP-ENV:Envelope&gt;"</span>;
+<a name="109" href="#109">109</a>     
+<a name="110" href="#110">110</a>     <strong class="jxr_keyword">private</strong> WSSecurityEngine secEngine = <strong class="jxr_keyword">new</strong> WSSecurityEngine();
+<a name="111" href="#111">111</a>     <strong class="jxr_keyword">private</strong> MessageContext msgContext;
+<a name="112" href="#112">112</a>     <strong class="jxr_keyword">private</strong> SOAPEnvelope unsignedEnvelope;
+<a name="113" href="#113">113</a> 
+<a name="114" href="#114">114</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="115" href="#115">115</a> <em class="jxr_javadoccomment">     * TestWSSecurity constructor</em>
+<a name="116" href="#116">116</a> <em class="jxr_javadoccomment">     * </em>
+<a name="117" href="#117">117</a> <em class="jxr_javadoccomment">     * @param name name of the test</em>
+<a name="118" href="#118">118</a> <em class="jxr_javadoccomment">     */</em>
+<a name="119" href="#119">119</a>     <strong class="jxr_keyword">public</strong> TestWSSecurityNew5(String name) {
+<a name="120" href="#120">120</a>         <strong class="jxr_keyword">super</strong>(name);
+<a name="121" href="#121">121</a>     }
+<a name="122" href="#122">122</a> 
+<a name="123" href="#123">123</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="124" href="#124">124</a> <em class="jxr_javadoccomment">     * JUnit suite</em>
+<a name="125" href="#125">125</a> <em class="jxr_javadoccomment">     * </em>
+<a name="126" href="#126">126</a> <em class="jxr_javadoccomment">     * @return a junit test suite</em>
+<a name="127" href="#127">127</a> <em class="jxr_javadoccomment">     */</em>
+<a name="128" href="#128">128</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong> Test suite() {
+<a name="129" href="#129">129</a>         <strong class="jxr_keyword">return</strong> <strong class="jxr_keyword">new</strong> TestSuite(TestWSSecurityNew5.<strong class="jxr_keyword">class</strong>);
+<a name="130" href="#130">130</a>     }
+<a name="131" href="#131">131</a> 
+<a name="132" href="#132">132</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="133" href="#133">133</a> <em class="jxr_javadoccomment">     * Setup method</em>
+<a name="134" href="#134">134</a> <em class="jxr_javadoccomment">     * </em>
+<a name="135" href="#135">135</a> <em class="jxr_javadoccomment">     * @throws java.lang.Exception Thrown when there is a problem in setup</em>
+<a name="136" href="#136">136</a> <em class="jxr_javadoccomment">     */</em>
+<a name="137" href="#137">137</a>     <strong class="jxr_keyword">protected</strong> <strong class="jxr_keyword">void</strong> setUp() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="138" href="#138">138</a>         AxisClient tmpEngine = <strong class="jxr_keyword">new</strong> AxisClient(<strong class="jxr_keyword">new</strong> NullProvider());
+<a name="139" href="#139">139</a>         msgContext = <strong class="jxr_keyword">new</strong> MessageContext(tmpEngine);
+<a name="140" href="#140">140</a>         unsignedEnvelope = getSOAPEnvelope();
+<a name="141" href="#141">141</a>     }
+<a name="142" href="#142">142</a> 
+<a name="143" href="#143">143</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="144" href="#144">144</a> <em class="jxr_javadoccomment">     * Constructs a soap envelope</em>
+<a name="145" href="#145">145</a> <em class="jxr_javadoccomment">     * </em>
+<a name="146" href="#146">146</a> <em class="jxr_javadoccomment">     * @return soap envelope</em>
+<a name="147" href="#147">147</a> <em class="jxr_javadoccomment">     * @throws java.lang.Exception if there is any problem constructing the soap envelope</em>
+<a name="148" href="#148">148</a> <em class="jxr_javadoccomment">     */</em>
+<a name="149" href="#149">149</a>     <strong class="jxr_keyword">protected</strong> SOAPEnvelope getSOAPEnvelope() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="150" href="#150">150</a>         InputStream in = <strong class="jxr_keyword">new</strong> ByteArrayInputStream(SOAPMSG.getBytes());
+<a name="151" href="#151">151</a>         Message msg = <strong class="jxr_keyword">new</strong> Message(in);
+<a name="152" href="#152">152</a>         msg.setMessageContext(msgContext);
+<a name="153" href="#153">153</a>         <strong class="jxr_keyword">return</strong> msg.getSOAPEnvelope();
+<a name="154" href="#154">154</a>     }
+<a name="155" href="#155">155</a> 
+<a name="156" href="#156">156</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="157" href="#157">157</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with password Digest to a WS-Security envelope</em>
+<a name="158" href="#158">158</a> <em class="jxr_javadoccomment">     */</em>
+<a name="159" href="#159">159</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenDigest() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="160" href="#160">160</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="161" href="#161">161</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">"verySecret"</span>);
+<a name="162" href="#162">162</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Digest...."</span>);
+<a name="163" href="#163">163</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="164" href="#164">164</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="165" href="#165">165</a>         secHeader.insertSecurityHeader(doc);
+<a name="166" href="#166">166</a>         Document signedDoc = builder.build(doc, secHeader);
+<a name="167" href="#167">167</a> 
+<a name="168" href="#168">168</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="169" href="#169">169</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Digest:"</span>);
+<a name="170" href="#170">170</a>             String outputString = 
+<a name="171" href="#171">171</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="172" href="#172">172</a>             LOG.debug(outputString);
+<a name="173" href="#173">173</a>         }
+<a name="174" href="#174">174</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Digest...."</span>);
+<a name="175" href="#175">175</a>         verify(signedDoc);
+<a name="176" href="#176">176</a>     }
+<a name="177" href="#177">177</a>     
+<a name="178" href="#178">178</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="179" href="#179">179</a> <em class="jxr_javadoccomment">     * Test for encoded passwords.</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> <strong class="jxr_keyword">void</strong> testUsernameTokenWithEncodedPasswordBaseline() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="182" href="#182">182</a>         String password = <span class="jxr_string">"password"</span>;
+<a name="183" href="#183">183</a>         <em class="jxr_comment">// The SHA-1 of the password is known as a password equivalent in the UsernameToken specification.</em>
+<a name="184" href="#184">184</a>         byte[] passwordHash = MessageDigest.getInstance(<span class="jxr_string">"SHA-1"</span>).digest(password.getBytes(<span class="jxr_string">"UTF-8"</span>));
+<a name="185" href="#185">185</a> 
+<a name="186" href="#186">186</a>         String nonce = <span class="jxr_string">"0x7bXAPZVn40AdCD0Xbt0g=="</span>;
+<a name="187" href="#187">187</a>         String created = <span class="jxr_string">"2010-06-28T15:16:37Z"</span>;
+<a name="188" href="#188">188</a>         String expectedPasswordDigest = <span class="jxr_string">"C0rena/6gKpRZ9ATj+e6ss5sAbQ="</span>;
+<a name="189" href="#189">189</a>         String actualPasswordDigest = UsernameToken.doPasswordDigest(nonce, created, passwordHash);
+<a name="190" href="#190">190</a>         assertEquals(<span class="jxr_string">"the password digest is not as expected"</span>, expectedPasswordDigest, actualPasswordDigest);
+<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">     * Test that adds a UserNameToken with password Digest to a WS-Security envelope</em>
+<a name="195" href="#195">195</a> <em class="jxr_javadoccomment">     */</em>
+<a name="196" href="#196">196</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenWithEncodedPassword() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="197" href="#197">197</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="198" href="#198">198</a>         builder.setPasswordsAreEncoded(<strong class="jxr_keyword">true</strong>);
+<a name="199" href="#199">199</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, Base64.encode(MessageDigest.getInstance(<span class="jxr_string">"SHA-1"</span>).digest(<span class="jxr_string">"verySecret"</span>.getBytes(<span class="jxr_string">"UTF-8"</span>))));
+<a name="200" href="#200">200</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Digest...."</span>);
+<a name="201" href="#201">201</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="202" href="#202">202</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="203" href="#203">203</a>         secHeader.insertSecurityHeader(doc);
+<a name="204" href="#204">204</a>         Document signedDoc = builder.build(doc, secHeader);
+<a name="205" href="#205">205</a> 
+<a name="206" href="#206">206</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="207" href="#207">207</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Digest:"</span>);
+<a name="208" href="#208">208</a>             String outputString = 
+<a name="209" href="#209">209</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="210" href="#210">210</a>             LOG.debug(outputString);
+<a name="211" href="#211">211</a>         }
+<a name="212" href="#212">212</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Digest...."</span>);
+<a name="213" href="#213">213</a> 
+<a name="214" href="#214">214</a>         <strong class="jxr_keyword">boolean</strong> passwordsAreEnabledOrig = WSSecurityEngine.getInstance().getWssConfig().getPasswordsAreEncoded();
+<a name="215" href="#215">215</a>         <strong class="jxr_keyword">try</strong> {
+<a name="216" href="#216">216</a>             WSSecurityEngine.getInstance().getWssConfig().setPasswordsAreEncoded(<strong class="jxr_keyword">true</strong>);
+<a name="217" href="#217">217</a>             verify(signedDoc);
+<a name="218" href="#218">218</a>         } <strong class="jxr_keyword">finally</strong> {
+<a name="219" href="#219">219</a>             WSSecurityEngine.getInstance().getWssConfig().setPasswordsAreEncoded(passwordsAreEnabledOrig);
+<a name="220" href="#220">220</a>         }
+<a name="221" href="#221">221</a>     }
+<a name="222" href="#222">222</a>     
+<a name="223" href="#223">223</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="224" href="#224">224</a> <em class="jxr_javadoccomment">     * Test that a bad username with password digest does not leak whether the username</em>
+<a name="225" href="#225">225</a> <em class="jxr_javadoccomment">     * is valid or not - see WSS-141.</em>
+<a name="226" href="#226">226</a> <em class="jxr_javadoccomment">     */</em>
+<a name="227" href="#227">227</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenBadUsername() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="228" href="#228">228</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="229" href="#229">229</a>         builder.setUserInfo(<span class="jxr_string">"badusername"</span>, <span class="jxr_string">"verySecret"</span>);
+<a name="230" href="#230">230</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Digest...."</span>);
+<a name="231" href="#231">231</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="232" href="#232">232</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="233" href="#233">233</a>         secHeader.insertSecurityHeader(doc);
+<a name="234" href="#234">234</a>         Document signedDoc = builder.build(doc, secHeader);
+<a name="235" href="#235">235</a> 
+<a name="236" href="#236">236</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="237" href="#237">237</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Digest:"</span>);
+<a name="238" href="#238">238</a>             String outputString = 
+<a name="239" href="#239">239</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="240" href="#240">240</a>             LOG.debug(outputString);
+<a name="241" href="#241">241</a>         }
+<a name="242" href="#242">242</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Digest...."</span>);
+<a name="243" href="#243">243</a>         <strong class="jxr_keyword">try</strong> {
+<a name="244" href="#244">244</a>             verify(signedDoc);
+<a name="245" href="#245">245</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad username"</span>);
+<a name="246" href="#246">246</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
+<a name="247" href="#247">247</a>             String message = ex.getMessage();
+<a name="248" href="#248">248</a>             assertTrue(message.indexOf(<span class="jxr_string">"badusername"</span>) == -1);
+<a name="249" href="#249">249</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+<a name="250" href="#250">250</a>             <em class="jxr_comment">// expected</em>
+<a name="251" href="#251">251</a>         }
+<a name="252" href="#252">252</a>     }
+<a name="253" href="#253">253</a>     
+<a name="254" href="#254">254</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="255" href="#255">255</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with a bad password Digest to a WS-Security envelope</em>
+<a name="256" href="#256">256</a> <em class="jxr_javadoccomment">     */</em>
+<a name="257" href="#257">257</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenBadDigest() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="258" href="#258">258</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="259" href="#259">259</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">"verySecre"</span>);
+<a name="260" href="#260">260</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Digest...."</span>);
+<a name="261" href="#261">261</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="262" href="#262">262</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="263" href="#263">263</a>         secHeader.insertSecurityHeader(doc);
+<a name="264" href="#264">264</a>         Document signedDoc = builder.build(doc, secHeader);
+<a name="265" href="#265">265</a> 
+<a name="266" href="#266">266</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="267" href="#267">267</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Digest:"</span>);
+<a name="268" href="#268">268</a>             String outputString = 
+<a name="269" href="#269">269</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="270" href="#270">270</a>             LOG.debug(outputString);
+<a name="271" href="#271">271</a>         }
+<a name="272" href="#272">272</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Digest...."</span>);
+<a name="273" href="#273">273</a>         <strong class="jxr_keyword">try</strong> {
+<a name="274" href="#274">274</a>             verify(signedDoc);
+<a name="275" href="#275">275</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad password digest"</span>);
+<a name="276" href="#276">276</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
+<a name="277" href="#277">277</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+<a name="278" href="#278">278</a>             <em class="jxr_comment">// expected</em>
+<a name="279" href="#279">279</a>         }
+<a name="280" href="#280">280</a>     }
+<a name="281" href="#281">281</a> 
+<a name="282" href="#282">282</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="283" href="#283">283</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with password text to a WS-Security envelope</em>
+<a name="284" href="#284">284</a> <em class="jxr_javadoccomment">     */</em>
+<a name="285" href="#285">285</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenText() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="286" href="#286">286</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="287" href="#287">287</a>         builder.setPasswordType(WSConstants.PASSWORD_TEXT);
+<a name="288" href="#288">288</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">"verySecret"</span>);
+<a name="289" href="#289">289</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Text...."</span>);
+<a name="290" href="#290">290</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="291" href="#291">291</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="292" href="#292">292</a>         secHeader.insertSecurityHeader(doc);
+<a name="293" href="#293">293</a>         Document signedDoc = builder.build(doc, secHeader);
+<a name="294" href="#294">294</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="295" href="#295">295</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Text:"</span>);
+<a name="296" href="#296">296</a>             String outputString = 
+<a name="297" href="#297">297</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="298" href="#298">298</a>             LOG.debug(outputString);
+<a name="299" href="#299">299</a>         }
+<a name="300" href="#300">300</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Text...."</span>);
+<a name="301" href="#301">301</a>         verify(signedDoc);
+<a name="302" href="#302">302</a>     }
+<a name="303" href="#303">303</a>     
+<a name="304" href="#304">304</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="305" href="#305">305</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with a digested password but with type of</em>
+<a name="306" href="#306">306</a> <em class="jxr_javadoccomment">     * password test.</em>
+<a name="307" href="#307">307</a> <em class="jxr_javadoccomment">     */</em>
+<a name="308" href="#308">308</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenDigestText() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="309" href="#309">309</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="310" href="#310">310</a>         builder.setPasswordType(WSConstants.PASSWORD_TEXT);
+<a name="311" href="#311">311</a>         byte[] password = <span class="jxr_string">"verySecret"</span>.getBytes();
+<a name="312" href="#312">312</a>         MessageDigest sha = MessageDigest.getInstance(<span class="jxr_string">"MD5"</span>);
+<a name="313" href="#313">313</a>         sha.reset();
+<a name="314" href="#314">314</a>         sha.update(password);
+<a name="315" href="#315">315</a>         String passwdDigest = Base64.encode(sha.digest());
+<a name="316" href="#316">316</a>         
+<a name="317" href="#317">317</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, passwdDigest);
+<a name="318" href="#318">318</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Text...."</span>);
+<a name="319" href="#319">319</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="320" href="#320">320</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="321" href="#321">321</a>         secHeader.insertSecurityHeader(doc);
+<a name="322" href="#322">322</a>         Document signedDoc = builder.build(doc, secHeader);
+<a name="323" href="#323">323</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="324" href="#324">324</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Text:"</span>);
+<a name="325" href="#325">325</a>             String outputString = 
+<a name="326" href="#326">326</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="327" href="#327">327</a>             LOG.debug(outputString);
+<a name="328" href="#328">328</a>         }
+<a name="329" href="#329">329</a>     }
+<a name="330" href="#330">330</a>     
+<a name="331" href="#331">331</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="332" href="#332">332</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with (bad) password text to a WS-Security envelope</em>
+<a name="333" href="#333">333</a> <em class="jxr_javadoccomment">     */</em>
+<a name="334" href="#334">334</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenBadText() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="335" href="#335">335</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="336" href="#336">336</a>         builder.setPasswordType(WSConstants.PASSWORD_TEXT);
+<a name="337" href="#337">337</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">"verySecre"</span>);
+<a name="338" href="#338">338</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken PW Text...."</span>);
+<a name="339" href="#339">339</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="340" href="#340">340</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="341" href="#341">341</a>         secHeader.insertSecurityHeader(doc);
+<a name="342" href="#342">342</a>         Document signedDoc = builder.build(doc, secHeader);
+<a name="343" href="#343">343</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="344" href="#344">344</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Text:"</span>);
+<a name="345" href="#345">345</a>             String outputString = 
+<a name="346" href="#346">346</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="347" href="#347">347</a>             LOG.debug(outputString);
+<a name="348" href="#348">348</a>         }
+<a name="349" href="#349">349</a>         LOG.info(<span class="jxr_string">"After adding UsernameToken PW Text...."</span>);
+<a name="350" href="#350">350</a>         
 <a name="351" href="#351">351</a>         <strong class="jxr_keyword">try</strong> {
 <a name="352" href="#352">352</a>             verify(signedDoc);
-<a name="353" href="#353">353</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on no password"</span>);
+<a name="353" href="#353">353</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on a bad password text"</span>);
 <a name="354" href="#354">354</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
 <a name="355" href="#355">355</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
 <a name="356" href="#356">356</a>             <em class="jxr_comment">// expected</em>
@@ -368,309 +368,362 @@
 <a name="358" href="#358">358</a>     }
 <a name="359" href="#359">359</a>     
 <a name="360" href="#360">360</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="361" href="#361">361</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with an empty password</em>
-<a name="362" href="#362">362</a> <em class="jxr_javadoccomment">     */</em>
-<a name="363" href="#363">363</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenEmptyPassword() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="364" href="#364">364</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="365" href="#365">365</a>         builder.setPasswordType(WSConstants.PASSWORD_TEXT);
-<a name="366" href="#366">366</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">""</span>);
-<a name="367" href="#367">367</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken with an empty password...."</span>);
-<a name="368" href="#368">368</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="369" href="#369">369</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="370" href="#370">370</a>         secHeader.insertSecurityHeader(doc);
-<a name="371" href="#371">371</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="372" href="#372">372</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="373" href="#373">373</a>             String outputString = 
-<a name="374" href="#374">374</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="375" href="#375">375</a>             LOG.debug(outputString);
-<a name="376" href="#376">376</a>         }
-<a name="377" href="#377">377</a>         verify(signedDoc);
-<a name="378" href="#378">378</a>     }
-<a name="379" href="#379">379</a>     
-<a name="380" href="#380">380</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="381" href="#381">381</a> <em class="jxr_javadoccomment">     * Test that processes a UserNameToken with an empty password</em>
-<a name="382" href="#382">382</a> <em class="jxr_javadoccomment">     */</em>
-<a name="383" href="#383">383</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmptyPasswordProcessing() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="384" href="#384">384</a>         InputStream in = <strong class="jxr_keyword">new</strong> ByteArrayInputStream(EMPTY_PASSWORD_MSG.getBytes());
-<a name="385" href="#385">385</a>         Message msg = <strong class="jxr_keyword">new</strong> Message(in);
-<a name="386" href="#386">386</a>         msg.setMessageContext(msgContext);
-<a name="387" href="#387">387</a>         SOAPEnvelope utEnvelope = msg.getSOAPEnvelope();
-<a name="388" href="#388">388</a>         Document doc = utEnvelope.getAsDocument();
-<a name="389" href="#389">389</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="390" href="#390">390</a>             LOG.debug(<span class="jxr_string">"Empty password message: "</span>);
-<a name="391" href="#391">391</a>             String outputString = 
-<a name="392" href="#392">392</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
-<a name="393" href="#393">393</a>             LOG.debug(outputString);
-<a name="394" href="#394">394</a>         }
-<a name="395" href="#395">395</a>         
-<a name="396" href="#396">396</a>         verify(doc);
-<a name="397" href="#397">397</a>     }
-<a name="398" href="#398">398</a>     
-<a name="399" href="#399">399</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="400" href="#400">400</a> <em class="jxr_javadoccomment">     * Test with a null token type. This will fail as the default is to reject custom</em>
-<a name="401" href="#401">401</a> <em class="jxr_javadoccomment">     * token types.</em>
-<a name="402" href="#402">402</a> <em class="jxr_javadoccomment">     */</em>
-<a name="403" href="#403">403</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenCustomFail() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="404" href="#404">404</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="405" href="#405">405</a>         builder.setPasswordType(<strong class="jxr_keyword">null</strong>);
-<a name="406" href="#406">406</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <strong class="jxr_keyword">null</strong>);
-<a name="407" href="#407">407</a>         
-<a name="408" href="#408">408</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="409" href="#409">409</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="410" href="#410">410</a>         secHeader.insertSecurityHeader(doc);
-<a name="411" href="#411">411</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="412" href="#412">412</a>         
-<a name="413" href="#413">413</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="414" href="#414">414</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Text:"</span>);
-<a name="415" href="#415">415</a>             String outputString = 
-<a name="416" href="#416">416</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="417" href="#417">417</a>             LOG.debug(outputString);
-<a name="418" href="#418">418</a>         }
-<a name="419" href="#419">419</a>         <strong class="jxr_keyword">try</strong> {
-<a name="420" href="#420">420</a>             verify(signedDoc);
-<a name="421" href="#421">421</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Custom token types are not permitted"</span>);
-<a name="422" href="#422">422</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
-<a name="423" href="#423">423</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
-<a name="424" href="#424">424</a>             <em class="jxr_comment">// expected</em>
-<a name="425" href="#425">425</a>         }
-<a name="426" href="#426">426</a>     }
-<a name="427" href="#427">427</a>     
-<a name="428" href="#428">428</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="429" href="#429">429</a> <em class="jxr_javadoccomment">     * Test with a null password type. This will pass as the WSSConfig is configured to </em>
-<a name="430" href="#430">430</a> <em class="jxr_javadoccomment">     * handle custom token types.</em>
-<a name="431" href="#431">431</a> <em class="jxr_javadoccomment">     */</em>
-<a name="432" href="#432">432</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenCustomPass() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="433" href="#433">433</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="434" href="#434">434</a>         builder.setPasswordType(<strong class="jxr_keyword">null</strong>);
-<a name="435" href="#435">435</a>         builder.setUserInfo(<span class="jxr_string">"customUser"</span>, <strong class="jxr_keyword">null</strong>);
-<a name="436" href="#436">436</a>         
-<a name="437" href="#437">437</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="438" href="#438">438</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="439" href="#439">439</a>         secHeader.insertSecurityHeader(doc);
-<a name="440" href="#440">440</a>         Document signedDoc = builder.build(doc, secHeader);
-<a name="441" href="#441">441</a>         
-<a name="442" href="#442">442</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
-<a name="443" href="#443">443</a>             LOG.debug(<span class="jxr_string">"Message with UserNameToken PW Text:"</span>);
-<a name="444" href="#444">444</a>             String outputString = 
-<a name="445" href="#445">445</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
-<a name="446" href="#446">446</a>             LOG.debug(outputString);
-<a name="447" href="#447">447</a>         }
-<a name="448" href="#448">448</a>         
-<a name="449" href="#449">449</a>         <em class="jxr_comment">//</em>
-<a name="450" href="#450">450</a>         <em class="jxr_comment">// Configure so that custom token types are accepted</em>
-<a name="451" href="#451">451</a>         <em class="jxr_comment">//</em>
-<a name="452" href="#452">452</a>         WSSConfig cfg = WSSConfig.getNewInstance();
-<a name="453" href="#453">453</a>         cfg.setHandleCustomPasswordTypes(<strong class="jxr_keyword">true</strong>);
-<a name="454" href="#454">454</a>         secEngine.setWssConfig(cfg);
-<a name="455" href="#455">455</a>         verify(signedDoc);
-<a name="456" href="#456">456</a>         
-<a name="457" href="#457">457</a>         <em class="jxr_comment">//</em>
-<a name="458" href="#458">458</a>         <em class="jxr_comment">// Go back to default for other tests</em>
-<a name="459" href="#459">459</a>         <em class="jxr_comment">//</em>
-<a name="460" href="#460">460</a>         cfg.setHandleCustomPasswordTypes(false);
-<a name="461" href="#461">461</a>         secEngine.setWssConfig(cfg);
-<a name="462" href="#462">462</a>     }
-<a name="463" href="#463">463</a>     
-<a name="464" href="#464">464</a>     
-<a name="465" href="#465">465</a>     <em class="jxr_javadoccomment">/**</em>
-<a name="466" href="#466">466</a> <em class="jxr_javadoccomment">     * A test for WSS-66 - the nonce string is null</em>
-<a name="467" href="#467">467</a> <em class="jxr_javadoccomment">     * <a href="http://issues.apache.org/jira/browse/WSS-66" target="alexandria_uri">http://issues.apache.org/jira/browse/WSS-66</a></em>
-<a name="468" href="#468">468</a> <em class="jxr_javadoccomment">     * "Possible security hole when PasswordDigest is used by client."</em>
-<a name="469" href="#469">469</a> <em class="jxr_javadoccomment">     */</em>
-<a name="470" href="#470">470</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testNullNonce() <strong class="jxr_keyword">throws</strong> Exception {
-<a name="471" href="#471">471</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
-<a name="472" href="#472">472</a>         builder.setPasswordType(WSConstants.PASSWORD_DIGEST);
-<a name="473" href="#473">473</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">"BAD_PASSWORD"</span>);
-<a name="474" href="#474">474</a>         
-<a name="475" href="#475">475</a>         Document doc = unsignedEnvelope.getAsDocument();
-<a name="476" href="#476">476</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
-<a name="477" href="#477">477</a>         secHeader.insertSecurityHeader(doc);
-<a name="478" href="#478">478</a>         Document utDoc = builder.build(doc, secHeader);
-<a name="479" href="#479">479</a>         
-<a name="480" href="#480">480</a>         <em class="jxr_comment">//</em>
-<a name="481" href="#481">481</a>         <em class="jxr_comment">// Manually find the Nonce node and set the content to null</em>
-<a name="482" href="#482">482</a>         <em class="jxr_comment">//</em>
-<a name="483" href="#483">483</a>         org.w3c.dom.Element elem = builder.getUsernameTokenElement();
-<a name="484" href="#484">484</a>         org.w3c.dom.NodeList list = elem.getElementsByTagName(<span class="jxr_string">"wsse:Nonce"</span>);
-<a name="485" href="#485">485</a>         org.w3c.dom.Node nonceNode = list.item(0);
-<a name="486" href="#486">486</a>         org.w3c.dom.Node childNode = nonceNode.getFirstChild();
-<a name="487" href="#487">487</a>         childNode.setNodeValue(<span class="jxr_string">""</span>);
+<a name="361" href="#361">361</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with no password type to a WS-Security envelope</em>
+<a name="362" href="#362">362</a> <em class="jxr_javadoccomment">     * See WSS-152 - https://issues.apache.org/jira/browse/WSS-152</em>
+<a name="363" href="#363">363</a> <em class="jxr_javadoccomment">     * "Problem with processing Username Tokens with no password type"</em>
+<a name="364" href="#364">364</a> <em class="jxr_javadoccomment">     * The 1.1 spec states that the password type is optional and defaults to password text, </em>
+<a name="365" href="#365">365</a> <em class="jxr_javadoccomment">     * and so we should handle an incoming Username Token accordingly.</em>
+<a name="366" href="#366">366</a> <em class="jxr_javadoccomment">     */</em>
+<a name="367" href="#367">367</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenNoPasswordType() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="368" href="#368">368</a>         InputStream in = <strong class="jxr_keyword">new</strong> ByteArrayInputStream(SOAPUTMSG.getBytes());
+<a name="369" href="#369">369</a>         Message msg = <strong class="jxr_keyword">new</strong> Message(in);
+<a name="370" href="#370">370</a>         msg.setMessageContext(msgContext);
+<a name="371" href="#371">371</a>         SOAPEnvelope utEnvelope = msg.getSOAPEnvelope();
+<a name="372" href="#372">372</a>         Document doc = utEnvelope.getAsDocument();
+<a name="373" href="#373">373</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="374" href="#374">374</a>             String outputString = 
+<a name="375" href="#375">375</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+<a name="376" href="#376">376</a>             LOG.debug(outputString);
+<a name="377" href="#377">377</a>         }
+<a name="378" href="#378">378</a>         verify(doc);
+<a name="379" href="#379">379</a>     }
+<a name="380" href="#380">380</a>     
+<a name="381" href="#381">381</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="382" href="#382">382</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with no password</em>
+<a name="383" href="#383">383</a> <em class="jxr_javadoccomment">     */</em>
+<a name="384" href="#384">384</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenNoPassword() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="385" href="#385">385</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="386" href="#386">386</a>         builder.setPasswordType(<strong class="jxr_keyword">null</strong>);
+<a name="387" href="#387">387</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <strong class="jxr_keyword">null</strong>);
+<a name="388" href="#388">388</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken with no password...."</span>);
+<a name="389" href="#389">389</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="390" href="#390">390</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="391" href="#391">391</a>         secHeader.insertSecurityHeader(doc);
+<a name="392" href="#392">392</a>         Document signedDoc = builder.build(doc, secHeader);
+<a name="393" href="#393">393</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="394" href="#394">394</a>             String outputString = 
+<a name="395" href="#395">395</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="396" href="#396">396</a>             LOG.debug(outputString);
+<a name="397" href="#397">397</a>         }
+<a name="398" href="#398">398</a>         <strong class="jxr_keyword">try</strong> {
+<a name="399" href="#399">399</a>             verify(signedDoc);
+<a name="400" href="#400">400</a>             <strong class="jxr_keyword">throw</strong> <strong class="jxr_keyword">new</strong> Exception(<span class="jxr_string">"Failure expected on no password"</span>);
+<a name="401" href="#401">401</a>         } <strong class="jxr_keyword">catch</strong> (WSSecurityException ex) {
+<a name="402" href="#402">402</a>             assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+<a name="403" href="#403">403</a>             <em class="jxr_comment">// expected</em>
+<a name="404" href="#404">404</a>         }
+<a name="405" href="#405">405</a>     }
+<a name="406" href="#406">406</a>     
+<a name="407" href="#407">407</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="408" href="#408">408</a> <em class="jxr_javadoccomment">     * Test that adds a UserNameToken with an empty password</em>
+<a name="409" href="#409">409</a> <em class="jxr_javadoccomment">     */</em>
+<a name="410" href="#410">410</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testUsernameTokenEmptyPassword() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="411" href="#411">411</a>         WSSecUsernameToken builder = <strong class="jxr_keyword">new</strong> WSSecUsernameToken();
+<a name="412" href="#412">412</a>         builder.setPasswordType(WSConstants.PASSWORD_TEXT);
+<a name="413" href="#413">413</a>         builder.setUserInfo(<span class="jxr_string">"wernerd"</span>, <span class="jxr_string">""</span>);
+<a name="414" href="#414">414</a>         LOG.info(<span class="jxr_string">"Before adding UsernameToken with an empty password...."</span>);
+<a name="415" href="#415">415</a>         Document doc = unsignedEnvelope.getAsDocument();
+<a name="416" href="#416">416</a>         WSSecHeader secHeader = <strong class="jxr_keyword">new</strong> WSSecHeader();
+<a name="417" href="#417">417</a>         secHeader.insertSecurityHeader(doc);
+<a name="418" href="#418">418</a>         Document signedDoc = builder.build(doc, secHeader);
+<a name="419" href="#419">419</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="420" href="#420">420</a>             String outputString = 
+<a name="421" href="#421">421</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(signedDoc);
+<a name="422" href="#422">422</a>             LOG.debug(outputString);
+<a name="423" href="#423">423</a>         }
+<a name="424" href="#424">424</a>         verify(signedDoc);
+<a name="425" href="#425">425</a>     }
+<a name="426" href="#426">426</a>     
+<a name="427" href="#427">427</a>     <em class="jxr_javadoccomment">/**</em>
+<a name="428" href="#428">428</a> <em class="jxr_javadoccomment">     * Test that processes a UserNameToken with an empty password</em>
+<a name="429" href="#429">429</a> <em class="jxr_javadoccomment">     */</em>
+<a name="430" href="#430">430</a>     <strong class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong> testEmptyPasswordProcessing() <strong class="jxr_keyword">throws</strong> Exception {
+<a name="431" href="#431">431</a>         InputStream in = <strong class="jxr_keyword">new</strong> ByteArrayInputStream(EMPTY_PASSWORD_MSG.getBytes());
+<a name="432" href="#432">432</a>         Message msg = <strong class="jxr_keyword">new</strong> Message(in);
+<a name="433" href="#433">433</a>         msg.setMessageContext(msgContext);
+<a name="434" href="#434">434</a>         SOAPEnvelope utEnvelope = msg.getSOAPEnvelope();
+<a name="435" href="#435">435</a>         Document doc = utEnvelope.getAsDocument();
+<a name="436" href="#436">436</a>         <strong class="jxr_keyword">if</strong> (LOG.isDebugEnabled()) {
+<a name="437" href="#437">437</a>             LOG.debug(<span class="jxr_string">"Empty password message: "</span>);
+<a name="438" href="#438">438</a>             String outputString = 
+<a name="439" href="#439">439</a>                 org.apache.ws.security.util.XMLUtils.PrettyDocumentToString(doc);
+<a name="440" href="#440">440</a>             LOG.debug(outputString);
+<a name="441" href="#441">441</a>         }

[... 451 lines stripped ...]