http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b2e10744/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.Action.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.Action.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.Action.html
deleted file mode 100644
index af4dcf4..0000000
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.Action.html
+++ /dev/null
@@ -1,340 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" 
href="../../../../../../../stylesheet.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span><a name="line.1"></a>
-<span class="sourceLineNo">002</span>/**<a name="line.2"></a>
-<span class="sourceLineNo">003</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.3"></a>
-<span class="sourceLineNo">004</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.4"></a>
-<span class="sourceLineNo">005</span> * distributed with this work for 
additional information<a name="line.5"></a>
-<span class="sourceLineNo">006</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.6"></a>
-<span class="sourceLineNo">007</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.7"></a>
-<span class="sourceLineNo">008</span> * "License"); you may not use this file 
except in compliance<a name="line.8"></a>
-<span class="sourceLineNo">009</span> * with the License.  You may obtain a 
copy of the License at<a name="line.9"></a>
-<span class="sourceLineNo">010</span> *<a name="line.10"></a>
-<span class="sourceLineNo">011</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.11"></a>
-<span class="sourceLineNo">012</span> *<a name="line.12"></a>
-<span class="sourceLineNo">013</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.13"></a>
-<span class="sourceLineNo">014</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.14"></a>
-<span class="sourceLineNo">015</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.15"></a>
-<span class="sourceLineNo">016</span> * See the License for the specific 
language governing permissions and<a name="line.16"></a>
-<span class="sourceLineNo">017</span> * limitations under the License.<a 
name="line.17"></a>
-<span class="sourceLineNo">018</span> */<a name="line.18"></a>
-<span class="sourceLineNo">019</span>package 
org.apache.hadoop.hbase.security.access;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.AuthUtil.toGroupEntry;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertTrue;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import static org.junit.Assert.fail;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import static org.mockito.Mockito.mock;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import com.google.protobuf.Service;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
com.google.protobuf.ServiceException;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.io.IOException;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
java.security.PrivilegedExceptionAction;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.Collections;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.HashMap;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.coprocessor.CoprocessorHost;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.coprocessor.MasterCoprocessor;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessor;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.ipc.protobuf.generated.TestProtos;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.ipc.protobuf.generated.TestRpcServiceProtos;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.security.AccessDeniedException;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.security.User;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.testclassification.SecurityTests;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.BeforeClass;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.ClassRule;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Test;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.junit.experimental.categories.Category;<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>/**<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * This class tests operations in 
MasterRpcServices which require ADMIN access.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * It doesn't test all operations which 
require ADMIN access, only those which get vetted within<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * MasterRpcServices at the point of 
entry itself (unlike old approach of using<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * hooks in AccessController).<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span> *<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * Sidenote:<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * There is one big difference between 
how security tests for AccessController hooks work, and how<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span> * the tests in this class for security 
in MasterRpcServices work.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * The difference arises because of the 
way AC &amp; MasterRpcServices get the user.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> *<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * In AccessController, it first checks 
if there is an active rpc user in ObserverContext. If not,<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * it uses UserProvider for current user. 
This *might* make sense in the context of coprocessors,<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * because they can be called outside the 
context of RPCs.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * But in the context of 
MasterRpcServices, only one way makes sense - RPCServer.getRequestUser().<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span> *<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * In AC tests, when we do FooUser.runAs 
on AccessController instance directly, it bypasses<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * the rpc framework completely, but 
works because UserProvider provides the correct user, i.e.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * FooUser in this case.<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span> *<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * But this doesn't work for the tests 
here, so we go around by doing complete RPCs.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> */<a name="line.75"></a>
-<span class="sourceLineNo">076</span>@Category({SecurityTests.class, 
MediumTests.class})<a name="line.76"></a>
-<span class="sourceLineNo">077</span>public class TestAdminOnlyOperations {<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>  @ClassRule<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      
HBaseClassTestRule.forClass(TestAdminOnlyOperations.class);<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  private static Configuration conf;<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  // user granted with all global 
permission<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  private static User USER_ADMIN;<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>  // user without admin permissions<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>  private static User USER_NON_ADMIN;<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final String GROUP_ADMIN 
= "admin_group";<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  private static User USER_GROUP_ADMIN;<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  // Dummy service to test execService 
calls. Needs to be public so can be loaded as Coprocessor.<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public static class DummyCpService 
implements MasterCoprocessor, RegionServerCoprocessor {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    public DummyCpService() {}<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>    @Override<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    public Iterable&lt;Service&gt; 
getServices() {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      return 
Collections.singleton(mock(TestRpcServiceProtos.TestProtobufRpcProto.class));<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>  private static void 
enableSecurity(Configuration conf) throws IOException {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    
conf.set("hadoop.security.authorization", "false");<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    
conf.set("hadoop.security.authentication", "simple");<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    
conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, 
AccessController.class.getName() +<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      "," + 
DummyCpService.class.getName());<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    
conf.set(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY, 
AccessController.class.getName());<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
conf.set(CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY, 
AccessController.class.getName() +<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      "," + 
DummyCpService.class.getName());<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    
conf.set(User.HBASE_SECURITY_AUTHORIZATION_CONF_KEY, "true");<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    
SecureTestUtil.configureSuperuser(conf);<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  @BeforeClass<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public static void setup() throws 
Exception {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    conf = 
TEST_UTIL.getConfiguration();<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>    // Enable security<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>    enableSecurity(conf);<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    TEST_UTIL.startMiniCluster();<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    // Wait for the ACL table to become 
available<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    
TEST_UTIL.waitUntilAllRegionsAssigned(AccessControlLists.ACL_TABLE_NAME);<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>    // Create users<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    USER_ADMIN = 
User.createUserForTesting(conf, "admin", new String[0]);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    USER_NON_ADMIN = 
User.createUserForTesting(conf, "non_admin", new String[0]);<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>    USER_GROUP_ADMIN =<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>        User.createUserForTesting(conf, 
"user_group_admin", new String[] { GROUP_ADMIN });<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>    // Assign permissions to users and 
groups<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    SecureTestUtil.grantGlobal(TEST_UTIL, 
USER_ADMIN.getShortName(), Permission.Action.ADMIN);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    SecureTestUtil.grantGlobal(TEST_UTIL, 
toGroupEntry(GROUP_ADMIN), Permission.Action.ADMIN);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    // No permissions to USER_NON_ADMIN<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>  interface Action {<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    void run(Admin admin) throws 
Exception;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private void verifyAllowed(User user, 
Action action) throws Exception {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    
user.runAs((PrivilegedExceptionAction&lt;?&gt;) () -&gt; {<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>          Admin admin = conn.getAdmin()) 
{<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        action.run(admin);<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      } catch (IOException e) {<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>        fail(e.toString());<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      return null;<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    });<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>  private void verifyDenied(User user, 
Action action) throws Exception {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    
user.runAs((PrivilegedExceptionAction&lt;?&gt;) () -&gt; {<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      boolean accessDenied = false;<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          Admin admin = conn.getAdmin()) 
{<a name="line.158"></a>
-<span class="sourceLineNo">159</span>        action.run(admin);<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      } catch (AccessDeniedException e) 
{<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        accessDenied = true;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      assertTrue("Expected access to be 
denied", accessDenied);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      return null;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    });<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  private void 
verifiedDeniedServiceException(User user, Action action) throws Exception {<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>    
user.runAs((PrivilegedExceptionAction&lt;?&gt;) () -&gt; {<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>      boolean accessDenied = false;<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>          Admin admin = conn.getAdmin()) 
{<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        action.run(admin);<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      } catch (ServiceException e) {<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>        // For 
MasterRpcServices.execService.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        if (e.getCause() instanceof 
AccessDeniedException) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>          accessDenied = true;<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>        }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      assertTrue("Expected access to be 
denied", accessDenied);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      return null;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    });<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>  private void 
verifyAdminCheckForAction(Action action) throws Exception {<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>    verifyAllowed(USER_ADMIN, action);<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>    verifyAllowed(USER_GROUP_ADMIN, 
action);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    verifyDenied(USER_NON_ADMIN, 
action);<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>  @Test<a name="line.192"></a>
-<span class="sourceLineNo">193</span>  public void testEnableCatalogJanitor() 
throws Exception {<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.enableCatalogJanitor(true));<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>  @Test<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  public void testRunCatalogJanitor() 
throws Exception {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.runCatalogJanitor());<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>  @Test<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public void testCleanerChoreRunning() 
throws Exception {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.cleanerChoreSwitch(true));<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>  @Test<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public void testRunCleanerChore() 
throws Exception {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.runCleanerChore());<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  @Test<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  public void testExecProcedure() throws 
Exception {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    verifyAdminCheckForAction((admin) 
-&gt; {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      // Using existing table instead of 
creating a new one.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      
admin.execProcedure("flush-table-proc", 
TableName.META_TABLE_NAME.getNameAsString(),<a name="line.216"></a>
-<span class="sourceLineNo">217</span>          new HashMap&lt;&gt;());<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>  @Test<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  public void testExecService() throws 
Exception {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    Action action = (admin) -&gt; {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>      
TestRpcServiceProtos.TestProtobufRpcProto.BlockingInterface service =<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>          
TestRpcServiceProtos.TestProtobufRpcProto.newBlockingStub(admin.coprocessorService());<a
 name="line.225"></a>
-<span class="sourceLineNo">226</span>      service.ping(null, 
TestProtos.EmptyRequestProto.getDefaultInstance());<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    };<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>    verifyAllowed(USER_ADMIN, action);<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    verifyAllowed(USER_GROUP_ADMIN, 
action);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    // This is same as above 
verifyAccessDenied<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    
verifiedDeniedServiceException(USER_NON_ADMIN, action);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>  @Test<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  public void testExecProcedureWithRet() 
throws Exception {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    verifyAdminCheckForAction((admin) 
-&gt; {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      // Using existing table instead of 
creating a new one.<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      
admin.execProcedureWithReturn("flush-table-proc", 
TableName.META_TABLE_NAME.getNameAsString(),<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          new HashMap&lt;&gt;());<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>    });<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>  @Test<a name="line.244"></a>
-<span class="sourceLineNo">245</span>  public void testNormalize() throws 
Exception {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.normalize());<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>  @Test<a name="line.249"></a>
-<span class="sourceLineNo">250</span>  public void testSetNormalizerRunning() 
throws Exception {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.normalizerSwitch(true));<a name="line.251"></a>
-<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>  @Test<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  public void 
testExecRegionServerService() throws Exception {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    Action action = (admin) -&gt; {<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>      ServerName serverName = 
TEST_UTIL.getHBaseCluster().getRegionServer(0).getServerName();<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>      
TestRpcServiceProtos.TestProtobufRpcProto.BlockingInterface service =<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>          
TestRpcServiceProtos.TestProtobufRpcProto.newBlockingStub(<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>              
admin.coprocessorService(serverName));<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      service.ping(null, 
TestProtos.EmptyRequestProto.getDefaultInstance());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    };<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span>    verifyAllowed(USER_ADMIN, action);<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>    verifyAllowed(USER_GROUP_ADMIN, 
action);<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    
verifiedDeniedServiceException(USER_NON_ADMIN, action);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span>}<a name="line.268"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b2e10744/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.DummyCpService.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.DummyCpService.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.DummyCpService.html
deleted file mode 100644
index af4dcf4..0000000
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.DummyCpService.html
+++ /dev/null
@@ -1,340 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" 
href="../../../../../../../stylesheet.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span><a name="line.1"></a>
-<span class="sourceLineNo">002</span>/**<a name="line.2"></a>
-<span class="sourceLineNo">003</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.3"></a>
-<span class="sourceLineNo">004</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.4"></a>
-<span class="sourceLineNo">005</span> * distributed with this work for 
additional information<a name="line.5"></a>
-<span class="sourceLineNo">006</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.6"></a>
-<span class="sourceLineNo">007</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.7"></a>
-<span class="sourceLineNo">008</span> * "License"); you may not use this file 
except in compliance<a name="line.8"></a>
-<span class="sourceLineNo">009</span> * with the License.  You may obtain a 
copy of the License at<a name="line.9"></a>
-<span class="sourceLineNo">010</span> *<a name="line.10"></a>
-<span class="sourceLineNo">011</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.11"></a>
-<span class="sourceLineNo">012</span> *<a name="line.12"></a>
-<span class="sourceLineNo">013</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.13"></a>
-<span class="sourceLineNo">014</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.14"></a>
-<span class="sourceLineNo">015</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.15"></a>
-<span class="sourceLineNo">016</span> * See the License for the specific 
language governing permissions and<a name="line.16"></a>
-<span class="sourceLineNo">017</span> * limitations under the License.<a 
name="line.17"></a>
-<span class="sourceLineNo">018</span> */<a name="line.18"></a>
-<span class="sourceLineNo">019</span>package 
org.apache.hadoop.hbase.security.access;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.AuthUtil.toGroupEntry;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertTrue;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import static org.junit.Assert.fail;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import static org.mockito.Mockito.mock;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import com.google.protobuf.Service;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
com.google.protobuf.ServiceException;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.io.IOException;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
java.security.PrivilegedExceptionAction;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.Collections;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.HashMap;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.coprocessor.CoprocessorHost;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.coprocessor.MasterCoprocessor;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessor;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.ipc.protobuf.generated.TestProtos;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.ipc.protobuf.generated.TestRpcServiceProtos;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.security.AccessDeniedException;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.security.User;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.testclassification.SecurityTests;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.BeforeClass;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.ClassRule;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Test;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.junit.experimental.categories.Category;<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>/**<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * This class tests operations in 
MasterRpcServices which require ADMIN access.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * It doesn't test all operations which 
require ADMIN access, only those which get vetted within<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * MasterRpcServices at the point of 
entry itself (unlike old approach of using<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * hooks in AccessController).<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span> *<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * Sidenote:<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * There is one big difference between 
how security tests for AccessController hooks work, and how<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span> * the tests in this class for security 
in MasterRpcServices work.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * The difference arises because of the 
way AC &amp; MasterRpcServices get the user.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> *<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * In AccessController, it first checks 
if there is an active rpc user in ObserverContext. If not,<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * it uses UserProvider for current user. 
This *might* make sense in the context of coprocessors,<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * because they can be called outside the 
context of RPCs.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * But in the context of 
MasterRpcServices, only one way makes sense - RPCServer.getRequestUser().<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span> *<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * In AC tests, when we do FooUser.runAs 
on AccessController instance directly, it bypasses<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * the rpc framework completely, but 
works because UserProvider provides the correct user, i.e.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * FooUser in this case.<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span> *<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * But this doesn't work for the tests 
here, so we go around by doing complete RPCs.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> */<a name="line.75"></a>
-<span class="sourceLineNo">076</span>@Category({SecurityTests.class, 
MediumTests.class})<a name="line.76"></a>
-<span class="sourceLineNo">077</span>public class TestAdminOnlyOperations {<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>  @ClassRule<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      
HBaseClassTestRule.forClass(TestAdminOnlyOperations.class);<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  private static Configuration conf;<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  // user granted with all global 
permission<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  private static User USER_ADMIN;<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>  // user without admin permissions<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>  private static User USER_NON_ADMIN;<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final String GROUP_ADMIN 
= "admin_group";<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  private static User USER_GROUP_ADMIN;<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  // Dummy service to test execService 
calls. Needs to be public so can be loaded as Coprocessor.<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public static class DummyCpService 
implements MasterCoprocessor, RegionServerCoprocessor {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    public DummyCpService() {}<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>    @Override<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    public Iterable&lt;Service&gt; 
getServices() {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      return 
Collections.singleton(mock(TestRpcServiceProtos.TestProtobufRpcProto.class));<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>  private static void 
enableSecurity(Configuration conf) throws IOException {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    
conf.set("hadoop.security.authorization", "false");<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    
conf.set("hadoop.security.authentication", "simple");<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    
conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, 
AccessController.class.getName() +<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      "," + 
DummyCpService.class.getName());<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    
conf.set(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY, 
AccessController.class.getName());<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
conf.set(CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY, 
AccessController.class.getName() +<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      "," + 
DummyCpService.class.getName());<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    
conf.set(User.HBASE_SECURITY_AUTHORIZATION_CONF_KEY, "true");<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    
SecureTestUtil.configureSuperuser(conf);<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  @BeforeClass<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public static void setup() throws 
Exception {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    conf = 
TEST_UTIL.getConfiguration();<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>    // Enable security<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>    enableSecurity(conf);<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    TEST_UTIL.startMiniCluster();<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    // Wait for the ACL table to become 
available<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    
TEST_UTIL.waitUntilAllRegionsAssigned(AccessControlLists.ACL_TABLE_NAME);<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>    // Create users<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    USER_ADMIN = 
User.createUserForTesting(conf, "admin", new String[0]);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    USER_NON_ADMIN = 
User.createUserForTesting(conf, "non_admin", new String[0]);<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>    USER_GROUP_ADMIN =<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>        User.createUserForTesting(conf, 
"user_group_admin", new String[] { GROUP_ADMIN });<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>    // Assign permissions to users and 
groups<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    SecureTestUtil.grantGlobal(TEST_UTIL, 
USER_ADMIN.getShortName(), Permission.Action.ADMIN);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    SecureTestUtil.grantGlobal(TEST_UTIL, 
toGroupEntry(GROUP_ADMIN), Permission.Action.ADMIN);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    // No permissions to USER_NON_ADMIN<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>  interface Action {<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    void run(Admin admin) throws 
Exception;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private void verifyAllowed(User user, 
Action action) throws Exception {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    
user.runAs((PrivilegedExceptionAction&lt;?&gt;) () -&gt; {<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>          Admin admin = conn.getAdmin()) 
{<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        action.run(admin);<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      } catch (IOException e) {<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>        fail(e.toString());<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      return null;<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    });<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>  private void verifyDenied(User user, 
Action action) throws Exception {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    
user.runAs((PrivilegedExceptionAction&lt;?&gt;) () -&gt; {<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      boolean accessDenied = false;<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          Admin admin = conn.getAdmin()) 
{<a name="line.158"></a>
-<span class="sourceLineNo">159</span>        action.run(admin);<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      } catch (AccessDeniedException e) 
{<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        accessDenied = true;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      assertTrue("Expected access to be 
denied", accessDenied);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      return null;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    });<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  private void 
verifiedDeniedServiceException(User user, Action action) throws Exception {<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>    
user.runAs((PrivilegedExceptionAction&lt;?&gt;) () -&gt; {<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>      boolean accessDenied = false;<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>          Admin admin = conn.getAdmin()) 
{<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        action.run(admin);<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      } catch (ServiceException e) {<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>        // For 
MasterRpcServices.execService.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        if (e.getCause() instanceof 
AccessDeniedException) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>          accessDenied = true;<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>        }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      assertTrue("Expected access to be 
denied", accessDenied);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      return null;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    });<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>  private void 
verifyAdminCheckForAction(Action action) throws Exception {<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>    verifyAllowed(USER_ADMIN, action);<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>    verifyAllowed(USER_GROUP_ADMIN, 
action);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    verifyDenied(USER_NON_ADMIN, 
action);<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>  @Test<a name="line.192"></a>
-<span class="sourceLineNo">193</span>  public void testEnableCatalogJanitor() 
throws Exception {<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.enableCatalogJanitor(true));<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>  @Test<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  public void testRunCatalogJanitor() 
throws Exception {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.runCatalogJanitor());<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>  @Test<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public void testCleanerChoreRunning() 
throws Exception {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.cleanerChoreSwitch(true));<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>  @Test<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public void testRunCleanerChore() 
throws Exception {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.runCleanerChore());<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  @Test<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  public void testExecProcedure() throws 
Exception {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    verifyAdminCheckForAction((admin) 
-&gt; {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      // Using existing table instead of 
creating a new one.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      
admin.execProcedure("flush-table-proc", 
TableName.META_TABLE_NAME.getNameAsString(),<a name="line.216"></a>
-<span class="sourceLineNo">217</span>          new HashMap&lt;&gt;());<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>  @Test<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  public void testExecService() throws 
Exception {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    Action action = (admin) -&gt; {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>      
TestRpcServiceProtos.TestProtobufRpcProto.BlockingInterface service =<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>          
TestRpcServiceProtos.TestProtobufRpcProto.newBlockingStub(admin.coprocessorService());<a
 name="line.225"></a>
-<span class="sourceLineNo">226</span>      service.ping(null, 
TestProtos.EmptyRequestProto.getDefaultInstance());<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    };<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>    verifyAllowed(USER_ADMIN, action);<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    verifyAllowed(USER_GROUP_ADMIN, 
action);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    // This is same as above 
verifyAccessDenied<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    
verifiedDeniedServiceException(USER_NON_ADMIN, action);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>  @Test<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  public void testExecProcedureWithRet() 
throws Exception {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    verifyAdminCheckForAction((admin) 
-&gt; {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      // Using existing table instead of 
creating a new one.<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      
admin.execProcedureWithReturn("flush-table-proc", 
TableName.META_TABLE_NAME.getNameAsString(),<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          new HashMap&lt;&gt;());<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>    });<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>  @Test<a name="line.244"></a>
-<span class="sourceLineNo">245</span>  public void testNormalize() throws 
Exception {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.normalize());<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>  @Test<a name="line.249"></a>
-<span class="sourceLineNo">250</span>  public void testSetNormalizerRunning() 
throws Exception {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.normalizerSwitch(true));<a name="line.251"></a>
-<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>  @Test<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  public void 
testExecRegionServerService() throws Exception {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    Action action = (admin) -&gt; {<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>      ServerName serverName = 
TEST_UTIL.getHBaseCluster().getRegionServer(0).getServerName();<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>      
TestRpcServiceProtos.TestProtobufRpcProto.BlockingInterface service =<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>          
TestRpcServiceProtos.TestProtobufRpcProto.newBlockingStub(<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>              
admin.coprocessorService(serverName));<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      service.ping(null, 
TestProtos.EmptyRequestProto.getDefaultInstance());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    };<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span>    verifyAllowed(USER_ADMIN, action);<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>    verifyAllowed(USER_GROUP_ADMIN, 
action);<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    
verifiedDeniedServiceException(USER_NON_ADMIN, action);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span>}<a name="line.268"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b2e10744/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.html
deleted file mode 100644
index af4dcf4..0000000
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/security/access/TestAdminOnlyOperations.html
+++ /dev/null
@@ -1,340 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
-<html lang="en">
-<head>
-<title>Source code</title>
-<link rel="stylesheet" type="text/css" 
href="../../../../../../../stylesheet.css" title="Style">
-</head>
-<body>
-<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span><a name="line.1"></a>
-<span class="sourceLineNo">002</span>/**<a name="line.2"></a>
-<span class="sourceLineNo">003</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.3"></a>
-<span class="sourceLineNo">004</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.4"></a>
-<span class="sourceLineNo">005</span> * distributed with this work for 
additional information<a name="line.5"></a>
-<span class="sourceLineNo">006</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.6"></a>
-<span class="sourceLineNo">007</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.7"></a>
-<span class="sourceLineNo">008</span> * "License"); you may not use this file 
except in compliance<a name="line.8"></a>
-<span class="sourceLineNo">009</span> * with the License.  You may obtain a 
copy of the License at<a name="line.9"></a>
-<span class="sourceLineNo">010</span> *<a name="line.10"></a>
-<span class="sourceLineNo">011</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.11"></a>
-<span class="sourceLineNo">012</span> *<a name="line.12"></a>
-<span class="sourceLineNo">013</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.13"></a>
-<span class="sourceLineNo">014</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.14"></a>
-<span class="sourceLineNo">015</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.15"></a>
-<span class="sourceLineNo">016</span> * See the License for the specific 
language governing permissions and<a name="line.16"></a>
-<span class="sourceLineNo">017</span> * limitations under the License.<a 
name="line.17"></a>
-<span class="sourceLineNo">018</span> */<a name="line.18"></a>
-<span class="sourceLineNo">019</span>package 
org.apache.hadoop.hbase.security.access;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
org.apache.hadoop.hbase.AuthUtil.toGroupEntry;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertTrue;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import static org.junit.Assert.fail;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import static org.mockito.Mockito.mock;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import com.google.protobuf.Service;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
com.google.protobuf.ServiceException;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.io.IOException;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
java.security.PrivilegedExceptionAction;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.Collections;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.HashMap;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.coprocessor.CoprocessorHost;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.coprocessor.MasterCoprocessor;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessor;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.ipc.protobuf.generated.TestProtos;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.ipc.protobuf.generated.TestRpcServiceProtos;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.security.AccessDeniedException;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.security.User;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.testclassification.SecurityTests;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.BeforeClass;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.ClassRule;<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Test;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.junit.experimental.categories.Category;<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>/**<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * This class tests operations in 
MasterRpcServices which require ADMIN access.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * It doesn't test all operations which 
require ADMIN access, only those which get vetted within<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * MasterRpcServices at the point of 
entry itself (unlike old approach of using<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * hooks in AccessController).<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span> *<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * Sidenote:<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * There is one big difference between 
how security tests for AccessController hooks work, and how<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span> * the tests in this class for security 
in MasterRpcServices work.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * The difference arises because of the 
way AC &amp; MasterRpcServices get the user.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> *<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * In AccessController, it first checks 
if there is an active rpc user in ObserverContext. If not,<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * it uses UserProvider for current user. 
This *might* make sense in the context of coprocessors,<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * because they can be called outside the 
context of RPCs.<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * But in the context of 
MasterRpcServices, only one way makes sense - RPCServer.getRequestUser().<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span> *<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * In AC tests, when we do FooUser.runAs 
on AccessController instance directly, it bypasses<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * the rpc framework completely, but 
works because UserProvider provides the correct user, i.e.<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * FooUser in this case.<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span> *<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * But this doesn't work for the tests 
here, so we go around by doing complete RPCs.<a name="line.74"></a>
-<span class="sourceLineNo">075</span> */<a name="line.75"></a>
-<span class="sourceLineNo">076</span>@Category({SecurityTests.class, 
MediumTests.class})<a name="line.76"></a>
-<span class="sourceLineNo">077</span>public class TestAdminOnlyOperations {<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>  @ClassRule<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      
HBaseClassTestRule.forClass(TestAdminOnlyOperations.class);<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private final static 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  private static Configuration conf;<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  // user granted with all global 
permission<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  private static User USER_ADMIN;<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>  // user without admin permissions<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>  private static User USER_NON_ADMIN;<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final String GROUP_ADMIN 
= "admin_group";<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  private static User USER_GROUP_ADMIN;<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  // Dummy service to test execService 
calls. Needs to be public so can be loaded as Coprocessor.<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public static class DummyCpService 
implements MasterCoprocessor, RegionServerCoprocessor {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    public DummyCpService() {}<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>    @Override<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    public Iterable&lt;Service&gt; 
getServices() {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      return 
Collections.singleton(mock(TestRpcServiceProtos.TestProtobufRpcProto.class));<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>  private static void 
enableSecurity(Configuration conf) throws IOException {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    
conf.set("hadoop.security.authorization", "false");<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    
conf.set("hadoop.security.authentication", "simple");<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    
conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, 
AccessController.class.getName() +<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      "," + 
DummyCpService.class.getName());<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    
conf.set(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY, 
AccessController.class.getName());<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
conf.set(CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY, 
AccessController.class.getName() +<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      "," + 
DummyCpService.class.getName());<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    
conf.set(User.HBASE_SECURITY_AUTHORIZATION_CONF_KEY, "true");<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    
SecureTestUtil.configureSuperuser(conf);<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  @BeforeClass<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public static void setup() throws 
Exception {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    conf = 
TEST_UTIL.getConfiguration();<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>    // Enable security<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>    enableSecurity(conf);<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    TEST_UTIL.startMiniCluster();<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    // Wait for the ACL table to become 
available<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    
TEST_UTIL.waitUntilAllRegionsAssigned(AccessControlLists.ACL_TABLE_NAME);<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>    // Create users<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    USER_ADMIN = 
User.createUserForTesting(conf, "admin", new String[0]);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    USER_NON_ADMIN = 
User.createUserForTesting(conf, "non_admin", new String[0]);<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>    USER_GROUP_ADMIN =<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>        User.createUserForTesting(conf, 
"user_group_admin", new String[] { GROUP_ADMIN });<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>    // Assign permissions to users and 
groups<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    SecureTestUtil.grantGlobal(TEST_UTIL, 
USER_ADMIN.getShortName(), Permission.Action.ADMIN);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    SecureTestUtil.grantGlobal(TEST_UTIL, 
toGroupEntry(GROUP_ADMIN), Permission.Action.ADMIN);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    // No permissions to USER_NON_ADMIN<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>  interface Action {<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    void run(Admin admin) throws 
Exception;<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private void verifyAllowed(User user, 
Action action) throws Exception {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    
user.runAs((PrivilegedExceptionAction&lt;?&gt;) () -&gt; {<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>          Admin admin = conn.getAdmin()) 
{<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        action.run(admin);<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>      } catch (IOException e) {<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>        fail(e.toString());<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      return null;<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    });<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>  private void verifyDenied(User user, 
Action action) throws Exception {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    
user.runAs((PrivilegedExceptionAction&lt;?&gt;) () -&gt; {<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      boolean accessDenied = false;<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>          Admin admin = conn.getAdmin()) 
{<a name="line.158"></a>
-<span class="sourceLineNo">159</span>        action.run(admin);<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      } catch (AccessDeniedException e) 
{<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        accessDenied = true;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      assertTrue("Expected access to be 
denied", accessDenied);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      return null;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    });<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  private void 
verifiedDeniedServiceException(User user, Action action) throws Exception {<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>    
user.runAs((PrivilegedExceptionAction&lt;?&gt;) () -&gt; {<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>      boolean accessDenied = false;<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>          Admin admin = conn.getAdmin()) 
{<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        action.run(admin);<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      } catch (ServiceException e) {<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>        // For 
MasterRpcServices.execService.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        if (e.getCause() instanceof 
AccessDeniedException) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>          accessDenied = true;<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>        }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      assertTrue("Expected access to be 
denied", accessDenied);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      return null;<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    });<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>  private void 
verifyAdminCheckForAction(Action action) throws Exception {<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>    verifyAllowed(USER_ADMIN, action);<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>    verifyAllowed(USER_GROUP_ADMIN, 
action);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    verifyDenied(USER_NON_ADMIN, 
action);<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>  @Test<a name="line.192"></a>
-<span class="sourceLineNo">193</span>  public void testEnableCatalogJanitor() 
throws Exception {<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.enableCatalogJanitor(true));<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>  @Test<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  public void testRunCatalogJanitor() 
throws Exception {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.runCatalogJanitor());<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>  @Test<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public void testCleanerChoreRunning() 
throws Exception {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.cleanerChoreSwitch(true));<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>  @Test<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  public void testRunCleanerChore() 
throws Exception {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.runCleanerChore());<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  @Test<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  public void testExecProcedure() throws 
Exception {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    verifyAdminCheckForAction((admin) 
-&gt; {<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      // Using existing table instead of 
creating a new one.<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      
admin.execProcedure("flush-table-proc", 
TableName.META_TABLE_NAME.getNameAsString(),<a name="line.216"></a>
-<span class="sourceLineNo">217</span>          new HashMap&lt;&gt;());<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>  @Test<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  public void testExecService() throws 
Exception {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    Action action = (admin) -&gt; {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>      
TestRpcServiceProtos.TestProtobufRpcProto.BlockingInterface service =<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>          
TestRpcServiceProtos.TestProtobufRpcProto.newBlockingStub(admin.coprocessorService());<a
 name="line.225"></a>
-<span class="sourceLineNo">226</span>      service.ping(null, 
TestProtos.EmptyRequestProto.getDefaultInstance());<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    };<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>    verifyAllowed(USER_ADMIN, action);<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    verifyAllowed(USER_GROUP_ADMIN, 
action);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    // This is same as above 
verifyAccessDenied<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    
verifiedDeniedServiceException(USER_NON_ADMIN, action);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>  @Test<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  public void testExecProcedureWithRet() 
throws Exception {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    verifyAdminCheckForAction((admin) 
-&gt; {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      // Using existing table instead of 
creating a new one.<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      
admin.execProcedureWithReturn("flush-table-proc", 
TableName.META_TABLE_NAME.getNameAsString(),<a name="line.239"></a>
-<span class="sourceLineNo">240</span>          new HashMap&lt;&gt;());<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>    });<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>  @Test<a name="line.244"></a>
-<span class="sourceLineNo">245</span>  public void testNormalize() throws 
Exception {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.normalize());<a name="line.246"></a>
-<span class="sourceLineNo">247</span>  }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>  @Test<a name="line.249"></a>
-<span class="sourceLineNo">250</span>  public void testSetNormalizerRunning() 
throws Exception {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    verifyAdminCheckForAction((admin) 
-&gt; admin.normalizerSwitch(true));<a name="line.251"></a>
-<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>  @Test<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  public void 
testExecRegionServerService() throws Exception {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    Action action = (admin) -&gt; {<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>      ServerName serverName = 
TEST_UTIL.getHBaseCluster().getRegionServer(0).getServerName();<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>      
TestRpcServiceProtos.TestProtobufRpcProto.BlockingInterface service =<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>          
TestRpcServiceProtos.TestProtobufRpcProto.newBlockingStub(<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>              
admin.coprocessorService(serverName));<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      service.ping(null, 
TestProtos.EmptyRequestProto.getDefaultInstance());<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    };<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span>    verifyAllowed(USER_ADMIN, action);<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>    verifyAllowed(USER_GROUP_ADMIN, 
action);<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    
verifiedDeniedServiceException(USER_NON_ADMIN, action);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span>}<a name="line.268"></a>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</body>
-</html>

Reply via email to