Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 84a296a43 -> 8bc57a1a2


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bc57a1a/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.html
index 2d059c0..0e3c33c 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/thrift/TestThriftHttpServer.html
@@ -29,214 +29,227 @@
 <span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertNull;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import static org.junit.Assert.fail;<a 
name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.ArrayList;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.List;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.thrift.generated.Hbase;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.util.IncrementingEnvironmentEdge;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.thrift.protocol.TBinaryProtocol;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.thrift.protocol.TProtocol;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.thrift.transport.THttpClient;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.thrift.transport.TTransportException;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.AfterClass;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.junit.BeforeClass;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.ClassRule;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.junit.Rule;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.junit.Test;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.junit.experimental.categories.Category;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.junit.rules.ExpectedException;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.slf4j.Logger;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.slf4j.LoggerFactory;<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hbase.thirdparty.com.google.common.base.Joiner;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>/**<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * Start the HBase Thrift HTTP server on 
a random port through the command-line<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * interface and talk to it from client 
side.<a name="line.54"></a>
-<span class="sourceLineNo">055</span> */<a name="line.55"></a>
-<span class="sourceLineNo">056</span>@Category({ClientTests.class, 
LargeTests.class})<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>public class TestThriftHttpServer {<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  @ClassRule<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      
HBaseClassTestRule.forClass(TestThriftHttpServer.class);<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final Logger LOG =<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>      
LoggerFactory.getLogger(TestThriftHttpServer.class);<a name="line.65"></a>
+<span class="sourceLineNo">024</span>import java.net.HttpURLConnection;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.net.URL;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.ArrayList;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.List;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.thrift.generated.Hbase;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.util.IncrementingEnvironmentEdge;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.thrift.protocol.TBinaryProtocol;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.thrift.protocol.TProtocol;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.thrift.transport.THttpClient;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.thrift.transport.TTransportException;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.AfterClass;<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.Assert;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.BeforeClass;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.ClassRule;<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.junit.Rule;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.Test;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.junit.experimental.categories.Category;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.junit.rules.ExpectedException;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.slf4j.Logger;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.slf4j.LoggerFactory;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.hbase.thirdparty.com.google.common.base.Joiner;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>/**<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * Start the HBase Thrift HTTP server on 
a random port through the command-line<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * interface and talk to it from client 
side.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>@Category({ClientTests.class, 
LargeTests.class})<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>public class TestThriftHttpServer {<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  @ClassRule<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.64"></a>
+<span class="sourceLineNo">065</span>      
HBaseClassTestRule.forClass(TestThriftHttpServer.class);<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  private static final 
HBaseTestingUtility TEST_UTIL =<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      new HBaseTestingUtility();<a 
name="line.68"></a>
+<span class="sourceLineNo">067</span>  private static final Logger LOG =<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>      
LoggerFactory.getLogger(TestThriftHttpServer.class);<a name="line.68"></a>
 <span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  private Thread httpServerThread;<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>  private volatile Exception 
httpServerException;<a name="line.71"></a>
+<span class="sourceLineNo">070</span>  private static final 
HBaseTestingUtility TEST_UTIL =<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      new HBaseTestingUtility();<a 
name="line.71"></a>
 <span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>  private Exception 
clientSideException;<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  private ThriftServer thriftServer;<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>  private int port;<a name="line.76"></a>
+<span class="sourceLineNo">073</span>  private Thread httpServerThread;<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>  private volatile Exception 
httpServerException;<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>  private Exception 
clientSideException;<a name="line.76"></a>
 <span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  @BeforeClass<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    
TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.thrift.http", 
true);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    
TEST_UTIL.getConfiguration().setBoolean("hbase.table.sanity.checks", false);<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>    TEST_UTIL.startMiniCluster();<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    //ensure that server time increments 
every time we do an operation, otherwise<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    //successive puts having the same 
timestamp will override each other<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    
EnvironmentEdgeManagerTestHelper.injectEdge(new 
IncrementingEnvironmentEdge());<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  @AfterClass<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    EnvironmentEdgeManager.reset();<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>  }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>  @Test<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  public void 
testExceptionThrownWhenMisConfigured() throws Exception {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    Configuration conf = new 
Configuration(TEST_UTIL.getConfiguration());<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    conf.set("hbase.thrift.security.qop", 
"privacy");<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    
conf.setBoolean("hbase.thrift.ssl.enabled", false);<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>    ThriftServerRunner runner = null;<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    ExpectedException thrown = 
ExpectedException.none();<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    try {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      
thrown.expect(IllegalArgumentException.class);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      thrown.expectMessage("Thrift HTTP 
Server's QoP is privacy, " +<a name="line.104"></a>
-<span class="sourceLineNo">105</span>          "but hbase.thrift.ssl.enabled 
is false");<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      runner = new 
ThriftServerRunner(conf);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      fail("Thrift HTTP Server starts up 
even with wrong security configurations.");<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    } catch (Exception e) {<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>    }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>    assertNull(runner);<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
+<span class="sourceLineNo">078</span>  private ThriftServer thriftServer;<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>  private int port;<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  @BeforeClass<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    
TEST_UTIL.getConfiguration().setBoolean("hbase.regionserver.thrift.http", 
true);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    
TEST_UTIL.getConfiguration().setBoolean("hbase.table.sanity.checks", false);<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>    TEST_UTIL.startMiniCluster();<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>    //ensure that server time increments 
every time we do an operation, otherwise<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    //successive puts having the same 
timestamp will override each other<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    
EnvironmentEdgeManagerTestHelper.injectEdge(new 
IncrementingEnvironmentEdge());<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  @AfterClass<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>    EnvironmentEdgeManager.reset();<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>  @Test<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  public void 
testExceptionThrownWhenMisConfigured() throws Exception {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    Configuration conf = new 
Configuration(TEST_UTIL.getConfiguration());<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    conf.set("hbase.thrift.security.qop", 
"privacy");<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    
conf.setBoolean("hbase.thrift.ssl.enabled", false);<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>    ThriftServerRunner runner = null;<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>    ExpectedException thrown = 
ExpectedException.none();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    try {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      
thrown.expect(IllegalArgumentException.class);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>      thrown.expectMessage("Thrift HTTP 
Server's QoP is privacy, " +<a name="line.107"></a>
+<span class="sourceLineNo">108</span>          "but hbase.thrift.ssl.enabled 
is false");<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      runner = new 
ThriftServerRunner(conf);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      fail("Thrift HTTP Server starts up 
even with wrong security configurations.");<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    } catch (Exception e) {<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
 <span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>  private void 
startHttpServerThread(final String[] args) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    LOG.info("Starting HBase Thrift 
server with HTTP server: " + Joiner.on(" ").join(args));<a name="line.115"></a>
+<span class="sourceLineNo">114</span>    assertNull(runner);<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
 <span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    httpServerException = null;<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>    httpServerThread = new Thread(new 
Runnable() {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      @Override<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      public void run() {<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>        try {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>          thriftServer.doMain(args);<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>        } catch (Exception e) {<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>          httpServerException = e;<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>        }<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    });<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    
httpServerThread.setName(ThriftServer.class.getSimpleName() +<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>        "-httpServer");<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>    httpServerThread.start();<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>  @Rule<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public ExpectedException exception = 
ExpectedException.none();<a name="line.134"></a>
+<span class="sourceLineNo">117</span>  private void 
startHttpServerThread(final String[] args) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    LOG.info("Starting HBase Thrift 
server with HTTP server: " + Joiner.on(" ").join(args));<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>    httpServerException = null;<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>    httpServerThread = new Thread(new 
Runnable() {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      @Override<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      public void run() {<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>        try {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>          thriftServer.doMain(args);<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>        } catch (Exception e) {<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>          httpServerException = e;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>        }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    });<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    
httpServerThread.setName(ThriftServer.class.getSimpleName() +<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>        "-httpServer");<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>    httpServerThread.start();<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>  }<a name="line.134"></a>
 <span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span>  @Test<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  public void 
testRunThriftServerWithHeaderBufferLength() throws Exception {<a 
name="line.137"></a>
+<span class="sourceLineNo">136</span>  @Rule<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  public ExpectedException exception = 
ExpectedException.none();<a name="line.137"></a>
 <span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>    // Test thrift server with HTTP 
header length less than 64k<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    try {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      runThriftServer(1024 * 63);<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>    } catch (TTransportException tex) {<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>      
assertFalse(tex.getMessage().equals("HTTP Response code: 431"));<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>    }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>    // Test thrift server with HTTP 
header length more than 64k, expect an exception<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    
exception.expect(TTransportException.class);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    exception.expectMessage("HTTP 
Response code: 431");<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    runThriftServer(1024 * 64);<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>  @Test<a name="line.152"></a>
-<span class="sourceLineNo">153</span>  public void testRunThriftServer() 
throws Exception {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    runThriftServer(0);<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  private void runThriftServer(int 
customHeaderSize) throws Exception {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    List&lt;String&gt; args = new 
ArrayList&lt;&gt;(3);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    port = 
HBaseTestingUtility.randomFreePort();<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    args.add("-" + 
ThriftServer.PORT_OPTION);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    args.add(String.valueOf(port));<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>    args.add("start");<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    thriftServer = new 
ThriftServer(TEST_UTIL.getConfiguration());<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    
startHttpServerThread(args.toArray(new String[args.size()]));<a 
name="line.165"></a>
+<span class="sourceLineNo">139</span>  @Test<a name="line.139"></a>
+<span class="sourceLineNo">140</span>  public void 
testRunThriftServerWithHeaderBufferLength() throws Exception {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>    // Test thrift server with HTTP 
header length less than 64k<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    try {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      runThriftServer(1024 * 63);<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>    } catch (TTransportException tex) {<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>      
assertFalse(tex.getMessage().equals("HTTP Response code: 431"));<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    // Test thrift server with HTTP 
header length more than 64k, expect an exception<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    
exception.expect(TTransportException.class);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    exception.expectMessage("HTTP 
Response code: 431");<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    runThriftServer(1024 * 64);<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>  }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>  @Test<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  public void testRunThriftServer() 
throws Exception {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    runThriftServer(0);<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  private void runThriftServer(int 
customHeaderSize) throws Exception {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    List&lt;String&gt; args = new 
ArrayList&lt;&gt;(3);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    port = 
HBaseTestingUtility.randomFreePort();<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    args.add("-" + 
ThriftServer.PORT_OPTION);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    args.add(String.valueOf(port));<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>    args.add("start");<a 
name="line.165"></a>
 <span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>    // wait up to 10s for the server to 
start<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    for (int i = 0; i &lt; 100<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>        &amp;&amp; 
(thriftServer.serverRunner == null ||  thriftServer.serverRunner.httpServer 
==<a name="line.169"></a>
-<span class="sourceLineNo">170</span>        null); i++) {<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      Thread.sleep(100);<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>    try {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      
talkToThriftServer(customHeaderSize);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    } catch (Exception ex) {<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>      clientSideException = ex;<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>    } finally {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      stopHttpServerThread();<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>    }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>    if (clientSideException != null) {<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>      LOG.error("Thrift client threw an 
exception " + clientSideException);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      if (clientSideException instanceof  
TTransportException) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        throw clientSideException;<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>      } else {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        throw new 
Exception(clientSideException);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>  private static volatile boolean 
tableCreated = false;<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  private void talkToThriftServer(int 
customHeaderSize) throws Exception {<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    THttpClient httpClient = new 
THttpClient(<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        "http://"+ HConstants.LOCALHOST + 
":" + port);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    httpClient.open();<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>    if (customHeaderSize &gt; 0) {<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>      StringBuilder sb = new 
StringBuilder();<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      for (int i = 0; i &lt; 
customHeaderSize; i++) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        sb.append("a");<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      
httpClient.setCustomHeader("User-Agent", sb.toString());<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span>    try {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      TProtocol prot;<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>      prot = new 
TBinaryProtocol(httpClient);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      Hbase.Client client = new 
Hbase.Client(prot);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      if (!tableCreated){<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>        
TestThriftServer.createTestTables(client);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>        tableCreated = true;<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>      }<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      
TestThriftServer.checkTableList(client);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    } finally {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      httpClient.close();<a 
name="line.217"></a>
+<span class="sourceLineNo">167</span>    thriftServer = new 
ThriftServer(TEST_UTIL.getConfiguration());<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    
startHttpServerThread(args.toArray(new String[args.size()]));<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span>    // wait up to 10s for the server to 
start<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    for (int i = 0; i &lt; 100<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>        &amp;&amp; 
(thriftServer.serverRunner == null ||  thriftServer.serverRunner.httpServer 
==<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        null); i++) {<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>      Thread.sleep(100);<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>    String url = "http://"+ 
HConstants.LOCALHOST + ":" + port;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    try {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      checkHttpMethods(url);<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>      talkToThriftServer(url, 
customHeaderSize);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    } catch (Exception ex) {<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>      clientSideException = ex;<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>    } finally {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      stopHttpServerThread();<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>    }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>    if (clientSideException != null) {<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>      LOG.error("Thrift client threw an 
exception " + clientSideException);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      if (clientSideException instanceof  
TTransportException) {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        throw clientSideException;<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>      } else {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        throw new 
Exception(clientSideException);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span>  private void checkHttpMethods(String 
url) throws Exception {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    // HTTP TRACE method should be 
disabled for security<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    // See 
https://www.owasp.org/index.php/Cross_Site_Tracing<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    HttpURLConnection conn = 
(HttpURLConnection) new URL(url).openConnection();<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    conn.setRequestMethod("TRACE");<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>    conn.connect();<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    
Assert.assertEquals(HttpURLConnection.HTTP_FORBIDDEN, 
conn.getResponseCode());<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>  private static volatile boolean 
tableCreated = false;<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>  private void talkToThriftServer(String 
url, int customHeaderSize) throws Exception {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    THttpClient httpClient = new 
THttpClient(url);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    httpClient.open();<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>    if (customHeaderSize &gt; 0) {<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>      StringBuilder sb = new 
StringBuilder();<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      for (int i = 0; i &lt; 
customHeaderSize; i++) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>        sb.append("a");<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>      }<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      
httpClient.setCustomHeader("User-Agent", sb.toString());<a name="line.217"></a>
 <span class="sourceLineNo">218</span>    }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>  private void stopHttpServerThread() 
throws Exception {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    LOG.debug("Stopping " + " Thrift HTTP 
server");<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    thriftServer.stop();<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>    httpServerThread.join();<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>    if (httpServerException != null) {<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>      LOG.error("Command-line invocation 
of HBase Thrift server threw an " +<a name="line.226"></a>
-<span class="sourceLineNo">227</span>          "exception", 
httpServerException);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      throw new 
Exception(httpServerException);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
-<span class="sourceLineNo">231</span>}<a name="line.231"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>    try {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      TProtocol prot;<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>      prot = new 
TBinaryProtocol(httpClient);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>      Hbase.Client client = new 
Hbase.Client(prot);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>      if (!tableCreated){<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>        
TestThriftServer.createTestTables(client);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        tableCreated = true;<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>      }<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      
TestThriftServer.checkTableList(client);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    } finally {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      httpClient.close();<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>    }<a name="line.231"></a>
+<span class="sourceLineNo">232</span>  }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>  private void stopHttpServerThread() 
throws Exception {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    LOG.debug("Stopping " + " Thrift HTTP 
server");<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    thriftServer.stop();<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>    httpServerThread.join();<a 
name="line.237"></a>
+<span class="sourceLineNo">238</span>    if (httpServerException != null) {<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>      LOG.error("Command-line invocation 
of HBase Thrift server threw an " +<a name="line.239"></a>
+<span class="sourceLineNo">240</span>          "exception", 
httpServerException);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      throw new 
Exception(httpServerException);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>  }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>}<a name="line.244"></a>
 
 
 

Reply via email to