You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2017/05/27 14:59:32 UTC
[12/40] hbase-site git commit: Published site at
82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8f0a032/devapidocs/src-html/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.html
index 2aea531..4ff3ed5 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/HBaseSaslRpcServer.html
@@ -6,7 +6,7 @@
</head>
<body>
<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
<span class="sourceLineNo">003</span> * or more contributor license agreements. See the NOTICE file<a name="line.3"></a>
<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
@@ -23,169 +23,225 @@
<span class="sourceLineNo">015</span> * See the License for the specific language governing permissions and<a name="line.15"></a>
<span class="sourceLineNo">016</span> * limitations under the License.<a name="line.16"></a>
<span class="sourceLineNo">017</span> */<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;<a name="line.19"></a>
-<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.io.ByteArrayInputStream;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.io.DataInputStream;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.io.IOException;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.Locale;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.Map;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.function.Consumer;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import javax.security.auth.callback.Callback;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import javax.security.auth.callback.CallbackHandler;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import javax.security.auth.callback.NameCallback;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import javax.security.auth.callback.PasswordCallback;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import javax.security.auth.callback.UnsupportedCallbackException;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import javax.security.sasl.AuthorizeCallback;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import javax.security.sasl.RealmCallback;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.commons.logging.Log;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.commons.logging.LogFactory;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.conf.Configuration;<a name="line.38"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.security;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.io.ByteArrayInputStream;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.io.DataInputStream;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.security.PrivilegedExceptionAction;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.Map;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import javax.security.auth.callback.Callback;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import javax.security.auth.callback.CallbackHandler;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import javax.security.auth.callback.NameCallback;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import javax.security.auth.callback.PasswordCallback;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import javax.security.auth.callback.UnsupportedCallbackException;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import javax.security.sasl.AuthorizeCallback;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import javax.security.sasl.RealmCallback;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import javax.security.sasl.Sasl;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import javax.security.sasl.SaslException;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import javax.security.sasl.SaslServer;<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.commons.logging.Log;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.commons.logging.LogFactory;<a name="line.38"></a>
<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.security.SaslUtil.QualityOfProtection;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.security.UserGroupInformation;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.security.token.SecretManager;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.security.token.SecretManager.InvalidToken;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.security.token.TokenIdentifier;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>/**<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * A utility class for dealing with SASL on RPC server<a name="line.47"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.security.UserGroupInformation;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.security.token.SecretManager;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.security.token.SecretManager.InvalidToken;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.security.token.TokenIdentifier;<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>/**<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * A utility class that encapsulates SASL logic for RPC server. Copied from<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * <code>org.apache.hadoop.security</code><a name="line.47"></a>
<span class="sourceLineNo">048</span> */<a name="line.48"></a>
<span class="sourceLineNo">049</span>@InterfaceAudience.Private<a name="line.49"></a>
<span class="sourceLineNo">050</span>public class HBaseSaslRpcServer {<a name="line.50"></a>
-<span class="sourceLineNo">051</span> private static final Log LOG = LogFactory.getLog(HBaseSaslRpcServer.class);<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span> private static Map<String, String> saslProps = null;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> public static void init(Configuration conf) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> saslProps = SaslUtil.initSaslProperties(conf.get("hbase.rpc.protection",<a name="line.56"></a>
-<span class="sourceLineNo">057</span> QualityOfProtection.AUTHENTICATION.name().toLowerCase(Locale.ROOT)));<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> public static Map<String, String> getSaslProps() {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> return saslProps;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> public static <T extends TokenIdentifier> T getIdentifier(String id,<a name="line.64"></a>
-<span class="sourceLineNo">065</span> SecretManager<T> secretManager) throws InvalidToken {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> byte[] tokenId = SaslUtil.decodeIdentifier(id);<a name="line.66"></a>
-<span class="sourceLineNo">067</span> T tokenIdentifier = secretManager.createIdentifier();<a name="line.67"></a>
-<span class="sourceLineNo">068</span> try {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> tokenIdentifier.readFields(new DataInputStream(new ByteArrayInputStream(<a name="line.69"></a>
-<span class="sourceLineNo">070</span> tokenId)));<a name="line.70"></a>
-<span class="sourceLineNo">071</span> } catch (IOException e) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> throw (InvalidToken) new InvalidToken(<a name="line.72"></a>
-<span class="sourceLineNo">073</span> "Can't de-serialize tokenIdentifier").initCause(e);<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return tokenIdentifier;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> /** CallbackHandler for SASL DIGEST-MD5 mechanism */<a name="line.79"></a>
-<span class="sourceLineNo">080</span> public static class SaslDigestCallbackHandler implements CallbackHandler {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private SecretManager<TokenIdentifier> secretManager;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> private Consumer<UserGroupInformation> attemptingUserConsumer;<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> public SaslDigestCallbackHandler(SecretManager<TokenIdentifier> secretManager,<a name="line.84"></a>
-<span class="sourceLineNo">085</span> Consumer<UserGroupInformation> attemptingUserConsumer) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> this.secretManager = secretManager;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> this.attemptingUserConsumer = attemptingUserConsumer;<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> private char[] getPassword(TokenIdentifier tokenid) throws InvalidToken {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> return SaslUtil.encodePassword(secretManager.retrievePassword(tokenid));<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> /** {@inheritDoc} */<a name="line.94"></a>
-<span class="sourceLineNo">095</span> @Override<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public void handle(Callback[] callbacks) throws InvalidToken,<a name="line.96"></a>
-<span class="sourceLineNo">097</span> UnsupportedCallbackException {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> NameCallback nc = null;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> PasswordCallback pc = null;<a name="line.99"></a>
-<span class="sourceLineNo">100</span> AuthorizeCallback ac = null;<a name="line.100"></a>
-<span class="sourceLineNo">101</span> for (Callback callback : callbacks) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (callback instanceof AuthorizeCallback) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> ac = (AuthorizeCallback) callback;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> } else if (callback instanceof NameCallback) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> nc = (NameCallback) callback;<a name="line.105"></a>
-<span class="sourceLineNo">106</span> } else if (callback instanceof PasswordCallback) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> pc = (PasswordCallback) callback;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> } else if (callback instanceof RealmCallback) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> continue; // realm is ignored<a name="line.109"></a>
-<span class="sourceLineNo">110</span> } else {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> throw new UnsupportedCallbackException(callback,<a name="line.111"></a>
-<span class="sourceLineNo">112</span> "Unrecognized SASL DIGEST-MD5 Callback");<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> if (pc != null) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> TokenIdentifier tokenIdentifier = getIdentifier(nc.getDefaultName(), secretManager);<a name="line.116"></a>
-<span class="sourceLineNo">117</span> char[] password = getPassword(tokenIdentifier);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> UserGroupInformation user = tokenIdentifier.getUser(); // may throw exception<a name="line.118"></a>
-<span class="sourceLineNo">119</span> attemptingUserConsumer.accept(user);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> if (LOG.isTraceEnabled()) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> LOG.trace("SASL server DIGEST-MD5 callback: setting password " + "for client: " +<a name="line.121"></a>
-<span class="sourceLineNo">122</span> tokenIdentifier.getUser());<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span> pc.setPassword(password);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span> if (ac != null) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> String authid = ac.getAuthenticationID();<a name="line.127"></a>
-<span class="sourceLineNo">128</span> String authzid = ac.getAuthorizationID();<a name="line.128"></a>
-<span class="sourceLineNo">129</span> if (authid.equals(authzid)) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ac.setAuthorized(true);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> } else {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> ac.setAuthorized(false);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span> if (ac.isAuthorized()) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (LOG.isTraceEnabled()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> String username =<a name="line.136"></a>
-<span class="sourceLineNo">137</span> getIdentifier(authzid, secretManager).getUser().getUserName();<a name="line.137"></a>
-<span class="sourceLineNo">138</span> LOG.trace("SASL server DIGEST-MD5 callback: setting "<a name="line.138"></a>
-<span class="sourceLineNo">139</span> + "canonicalized client ID: " + username);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span> ac.setAuthorizedID(authzid);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> }<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<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><a name="line.146"></a>
-<span class="sourceLineNo">147</span> /** CallbackHandler for SASL GSSAPI Kerberos mechanism */<a name="line.147"></a>
-<span class="sourceLineNo">148</span> public static class SaslGssCallbackHandler implements CallbackHandler {<a name="line.148"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> private static final Log LOG = LogFactory.getLog(HBaseSaslRpcServer.class);<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span> private final SaslServer saslServer;<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span> private UserGroupInformation attemptingUser; // user name before auth<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> public HBaseSaslRpcServer(AuthMethod method, Map<String, String> saslProps,<a name="line.58"></a>
+<span class="sourceLineNo">059</span> SecretManager<TokenIdentifier> secretManager) throws IOException {<a name="line.59"></a>
+<span class="sourceLineNo">060</span> switch (method) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span> case DIGEST:<a name="line.61"></a>
+<span class="sourceLineNo">062</span> if (secretManager == null) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> throw new AccessDeniedException("Server is not configured to do DIGEST authentication.");<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span> saslServer = Sasl.createSaslServer(AuthMethod.DIGEST.getMechanismName(), null,<a name="line.65"></a>
+<span class="sourceLineNo">066</span> SaslUtil.SASL_DEFAULT_REALM, saslProps, new SaslDigestCallbackHandler(secretManager));<a name="line.66"></a>
+<span class="sourceLineNo">067</span> break;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> case KERBEROS:<a name="line.68"></a>
+<span class="sourceLineNo">069</span> UserGroupInformation current = UserGroupInformation.getCurrentUser();<a name="line.69"></a>
+<span class="sourceLineNo">070</span> String fullName = current.getUserName();<a name="line.70"></a>
+<span class="sourceLineNo">071</span> if (LOG.isDebugEnabled()) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> LOG.debug("Kerberos principal name is " + fullName);<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> String[] names = SaslUtil.splitKerberosName(fullName);<a name="line.74"></a>
+<span class="sourceLineNo">075</span> if (names.length != 3) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span> throw new AccessDeniedException(<a name="line.76"></a>
+<span class="sourceLineNo">077</span> "Kerberos principal name does NOT have the expected " + "hostname part: " + fullName);<a name="line.77"></a>
+<span class="sourceLineNo">078</span> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span> try {<a name="line.79"></a>
+<span class="sourceLineNo">080</span> saslServer = current.doAs(new PrivilegedExceptionAction<SaslServer>() {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> @Override<a name="line.81"></a>
+<span class="sourceLineNo">082</span> public SaslServer run() throws SaslException {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return Sasl.createSaslServer(AuthMethod.KERBEROS.getMechanismName(), names[0],<a name="line.83"></a>
+<span class="sourceLineNo">084</span> names[1], saslProps, new SaslGssCallbackHandler());<a name="line.84"></a>
+<span class="sourceLineNo">085</span> }<a name="line.85"></a>
+<span class="sourceLineNo">086</span> });<a name="line.86"></a>
+<span class="sourceLineNo">087</span> } catch (InterruptedException e) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> // should not happen<a name="line.88"></a>
+<span class="sourceLineNo">089</span> throw new AssertionError(e);<a name="line.89"></a>
+<span class="sourceLineNo">090</span> }<a name="line.90"></a>
+<span class="sourceLineNo">091</span> break;<a name="line.91"></a>
+<span class="sourceLineNo">092</span> default:<a name="line.92"></a>
+<span class="sourceLineNo">093</span> throw new IOException("Unknown authentication method " + method);<a name="line.93"></a>
+<span class="sourceLineNo">094</span> }<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> public boolean isComplete() {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> return saslServer.isComplete();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> public byte[] evaluateResponse(byte[] response) throws SaslException {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> return saslServer.evaluateResponse(response);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> /** Release resources used by wrapped saslServer */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public void dispose() {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> SaslUtil.safeDispose(saslServer);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> public UserGroupInformation getAttemptingUser() {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> return attemptingUser;<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> public byte[] wrap(byte[] buf, int off, int len) throws SaslException {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> return saslServer.wrap(buf, off, len);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> public byte[] unwrap(byte[] buf, int off, int len) throws SaslException {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> return saslServer.unwrap(buf, off, len);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> public String getNegotiatedQop() {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> return (String) saslServer.getNegotiatedProperty(Sasl.QOP);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> public String getAuthorizationID() {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> return saslServer.getAuthorizationID();<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> public static <T extends TokenIdentifier> T getIdentifier(String id,<a name="line.130"></a>
+<span class="sourceLineNo">131</span> SecretManager<T> secretManager) throws InvalidToken {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> byte[] tokenId = SaslUtil.decodeIdentifier(id);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> T tokenIdentifier = secretManager.createIdentifier();<a name="line.133"></a>
+<span class="sourceLineNo">134</span> try {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> tokenIdentifier.readFields(new DataInputStream(new ByteArrayInputStream(tokenId)));<a name="line.135"></a>
+<span class="sourceLineNo">136</span> } catch (IOException e) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> throw (InvalidToken) new InvalidToken("Can't de-serialize tokenIdentifier").initCause(e);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span> return tokenIdentifier;<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> /** CallbackHandler for SASL DIGEST-MD5 mechanism */<a name="line.142"></a>
+<span class="sourceLineNo">143</span> private class SaslDigestCallbackHandler implements CallbackHandler {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> private SecretManager<TokenIdentifier> secretManager;<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> public SaslDigestCallbackHandler(SecretManager<TokenIdentifier> secretManager) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> this.secretManager = secretManager;<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> /** {@inheritDoc} */<a name="line.150"></a>
-<span class="sourceLineNo">151</span> @Override<a name="line.151"></a>
-<span class="sourceLineNo">152</span> public void handle(Callback[] callbacks) throws<a name="line.152"></a>
-<span class="sourceLineNo">153</span> UnsupportedCallbackException {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> AuthorizeCallback ac = null;<a name="line.154"></a>
-<span class="sourceLineNo">155</span> for (Callback callback : callbacks) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> if (callback instanceof AuthorizeCallback) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> ac = (AuthorizeCallback) callback;<a name="line.157"></a>
-<span class="sourceLineNo">158</span> } else {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> throw new UnsupportedCallbackException(callback,<a name="line.159"></a>
-<span class="sourceLineNo">160</span> "Unrecognized SASL GSSAPI Callback");<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span> if (ac != null) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> String authid = ac.getAuthenticationID();<a name="line.164"></a>
-<span class="sourceLineNo">165</span> String authzid = ac.getAuthorizationID();<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if (authid.equals(authzid)) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> ac.setAuthorized(true);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> } else {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> ac.setAuthorized(false);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> }<a name="line.170"></a>
-<span class="sourceLineNo">171</span> if (ac.isAuthorized()) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (LOG.isDebugEnabled())<a name="line.172"></a>
-<span class="sourceLineNo">173</span> LOG.debug("SASL server GSSAPI callback: setting "<a name="line.173"></a>
-<span class="sourceLineNo">174</span> + "canonicalized client ID: " + authzid);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> ac.setAuthorizedID(authzid);<a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<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>}<a name="line.180"></a>
+<span class="sourceLineNo">150</span> private char[] getPassword(TokenIdentifier tokenid) throws InvalidToken {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> return SaslUtil.encodePassword(secretManager.retrievePassword(tokenid));<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> /** {@inheritDoc} */<a name="line.154"></a>
+<span class="sourceLineNo">155</span> @Override<a name="line.155"></a>
+<span class="sourceLineNo">156</span> public void handle(Callback[] callbacks) throws InvalidToken, UnsupportedCallbackException {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> NameCallback nc = null;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> PasswordCallback pc = null;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> AuthorizeCallback ac = null;<a name="line.159"></a>
+<span class="sourceLineNo">160</span> for (Callback callback : callbacks) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> if (callback instanceof AuthorizeCallback) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> ac = (AuthorizeCallback) callback;<a name="line.162"></a>
+<span class="sourceLineNo">163</span> } else if (callback instanceof NameCallback) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> nc = (NameCallback) callback;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> } else if (callback instanceof PasswordCallback) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> pc = (PasswordCallback) callback;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> } else if (callback instanceof RealmCallback) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> continue; // realm is ignored<a name="line.168"></a>
+<span class="sourceLineNo">169</span> } else {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> throw new UnsupportedCallbackException(callback, "Unrecognized SASL DIGEST-MD5 Callback");<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span> }<a name="line.172"></a>
+<span class="sourceLineNo">173</span> if (pc != null) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> TokenIdentifier tokenIdentifier = getIdentifier(nc.getDefaultName(), secretManager);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> char[] password = getPassword(tokenIdentifier);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> UserGroupInformation user = tokenIdentifier.getUser(); // may throw exception<a name="line.176"></a>
+<span class="sourceLineNo">177</span> attemptingUser = user;<a name="line.177"></a>
+<span class="sourceLineNo">178</span> if (LOG.isTraceEnabled()) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span> LOG.trace("SASL server DIGEST-MD5 callback: setting password " + "for client: " +<a name="line.179"></a>
+<span class="sourceLineNo">180</span> tokenIdentifier.getUser());<a name="line.180"></a>
+<span class="sourceLineNo">181</span> }<a name="line.181"></a>
+<span class="sourceLineNo">182</span> pc.setPassword(password);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (ac != null) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> String authid = ac.getAuthenticationID();<a name="line.185"></a>
+<span class="sourceLineNo">186</span> String authzid = ac.getAuthorizationID();<a name="line.186"></a>
+<span class="sourceLineNo">187</span> if (authid.equals(authzid)) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> ac.setAuthorized(true);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> } else {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> ac.setAuthorized(false);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (ac.isAuthorized()) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (LOG.isTraceEnabled()) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> String username = getIdentifier(authzid, secretManager).getUser().getUserName();<a name="line.194"></a>
+<span class="sourceLineNo">195</span> LOG.trace(<a name="line.195"></a>
+<span class="sourceLineNo">196</span> "SASL server DIGEST-MD5 callback: setting " + "canonicalized client ID: " + username);<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> ac.setAuthorizedID(authzid);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<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> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> /** CallbackHandler for SASL GSSAPI Kerberos mechanism */<a name="line.204"></a>
+<span class="sourceLineNo">205</span> private static class SaslGssCallbackHandler implements CallbackHandler {<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> /** {@inheritDoc} */<a name="line.207"></a>
+<span class="sourceLineNo">208</span> @Override<a name="line.208"></a>
+<span class="sourceLineNo">209</span> public void handle(Callback[] callbacks) throws UnsupportedCallbackException {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> AuthorizeCallback ac = null;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> for (Callback callback : callbacks) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> if (callback instanceof AuthorizeCallback) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> ac = (AuthorizeCallback) callback;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> } else {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> throw new UnsupportedCallbackException(callback, "Unrecognized SASL GSSAPI Callback");<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (ac != null) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> String authid = ac.getAuthenticationID();<a name="line.219"></a>
+<span class="sourceLineNo">220</span> String authzid = ac.getAuthorizationID();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> if (authid.equals(authzid)) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> ac.setAuthorized(true);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> } else {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> ac.setAuthorized(false);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span> if (ac.isAuthorized()) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> if (LOG.isDebugEnabled()) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> LOG.debug(<a name="line.228"></a>
+<span class="sourceLineNo">229</span> "SASL server GSSAPI callback: setting " + "canonicalized client ID: " + authzid);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span> ac.setAuthorizedID(authzid);<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> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>}<a name="line.236"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8f0a032/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html
index 9ee1f3f..282ab86 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html
@@ -32,106 +32,115 @@
<span class="sourceLineNo">024</span>import javax.security.sasl.Sasl;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import javax.security.sasl.SaslClient;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import javax.security.sasl.SaslException;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.commons.codec.binary.Base64;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.commons.logging.Log;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.commons.logging.LogFactory;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>@InterfaceAudience.Private<a name="line.33"></a>
-<span class="sourceLineNo">034</span>public class SaslUtil {<a name="line.34"></a>
-<span class="sourceLineNo">035</span> private static final Log LOG = LogFactory.getLog(SaslUtil.class);<a name="line.35"></a>
-<span class="sourceLineNo">036</span> public static final String SASL_DEFAULT_REALM = "default";<a name="line.36"></a>
-<span class="sourceLineNo">037</span> public static final int SWITCH_TO_SIMPLE_AUTH = -88;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span> public enum QualityOfProtection {<a name="line.39"></a>
-<span class="sourceLineNo">040</span> AUTHENTICATION("auth"),<a name="line.40"></a>
-<span class="sourceLineNo">041</span> INTEGRITY("auth-int"),<a name="line.41"></a>
-<span class="sourceLineNo">042</span> PRIVACY("auth-conf");<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span> private final String saslQop;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> QualityOfProtection(String saslQop) {<a name="line.46"></a>
-<span class="sourceLineNo">047</span> this.saslQop = saslQop;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> }<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> public String getSaslQop() {<a name="line.50"></a>
-<span class="sourceLineNo">051</span> return saslQop;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> }<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span> public boolean matches(String stringQop) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span> if (saslQop.equals(stringQop)) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> LOG.warn("Use authentication/integrity/privacy as value for rpc protection "<a name="line.56"></a>
-<span class="sourceLineNo">057</span> + "configurations instead of auth/auth-int/auth-conf.");<a name="line.57"></a>
-<span class="sourceLineNo">058</span> return true;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span> return name().equalsIgnoreCase(stringQop);<a name="line.60"></a>
-<span class="sourceLineNo">061</span> }<a name="line.61"></a>
-<span class="sourceLineNo">062</span> }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> /** Splitting fully qualified Kerberos name into parts */<a name="line.64"></a>
-<span class="sourceLineNo">065</span> public static String[] splitKerberosName(String fullName) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> return fullName.split("[/@]");<a name="line.66"></a>
-<span class="sourceLineNo">067</span> }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> static String encodeIdentifier(byte[] identifier) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> return new String(Base64.encodeBase64(identifier));<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> static byte[] decodeIdentifier(String identifier) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> return Base64.decodeBase64(identifier.getBytes());<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> static char[] encodePassword(byte[] password) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> return new String(Base64.encodeBase64(password)).toCharArray();<a name="line.78"></a>
-<span class="sourceLineNo">079</span> }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> /**<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * Returns {@link org.apache.hadoop.hbase.security.SaslUtil.QualityOfProtection}<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * corresponding to the given {@code stringQop} value.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * @throws IllegalArgumentException If stringQop doesn't match any QOP.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> public static QualityOfProtection getQop(String stringQop) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> for (QualityOfProtection qop : QualityOfProtection.values()) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> if (qop.matches(stringQop)) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return qop;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span> throw new IllegalArgumentException("Invalid qop: " + stringQop<a name="line.92"></a>
-<span class="sourceLineNo">093</span> + ". It must be one of 'authentication', 'integrity', 'privacy'.");<a name="line.93"></a>
-<span class="sourceLineNo">094</span> }<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> * @param rpcProtection Value of 'hbase.rpc.protection' configuration.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * @return Map with values for SASL properties.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> */<a name="line.99"></a>
-<span class="sourceLineNo">100</span> static Map<String, String> initSaslProperties(String rpcProtection) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> String saslQop;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (rpcProtection.isEmpty()) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> saslQop = QualityOfProtection.AUTHENTICATION.getSaslQop();<a name="line.103"></a>
-<span class="sourceLineNo">104</span> } else {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> String[] qops = rpcProtection.split(",");<a name="line.105"></a>
-<span class="sourceLineNo">106</span> StringBuilder saslQopBuilder = new StringBuilder();<a name="line.106"></a>
-<span class="sourceLineNo">107</span> for (int i = 0; i < qops.length; ++i) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> QualityOfProtection qop = getQop(qops[i]);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> saslQopBuilder.append(",").append(qop.getSaslQop());<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span> saslQop = saslQopBuilder.substring(1); // remove first ','<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> Map<String, String> saslProps = new TreeMap<>();<a name="line.113"></a>
-<span class="sourceLineNo">114</span> saslProps.put(Sasl.QOP, saslQop);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> saslProps.put(Sasl.SERVER_AUTH, "true");<a name="line.115"></a>
-<span class="sourceLineNo">116</span> return saslProps;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> static void safeDispose(SaslClient saslClient) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> try {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> saslClient.dispose();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> } catch (SaslException e) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> LOG.error("Error disposing of SASL client", e);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<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">027</span>import javax.security.sasl.SaslServer;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.commons.codec.binary.Base64;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.commons.logging.Log;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.commons.logging.LogFactory;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>@InterfaceAudience.Private<a name="line.34"></a>
+<span class="sourceLineNo">035</span>public class SaslUtil {<a name="line.35"></a>
+<span class="sourceLineNo">036</span> private static final Log LOG = LogFactory.getLog(SaslUtil.class);<a name="line.36"></a>
+<span class="sourceLineNo">037</span> public static final String SASL_DEFAULT_REALM = "default";<a name="line.37"></a>
+<span class="sourceLineNo">038</span> public static final int SWITCH_TO_SIMPLE_AUTH = -88;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> public enum QualityOfProtection {<a name="line.40"></a>
+<span class="sourceLineNo">041</span> AUTHENTICATION("auth"),<a name="line.41"></a>
+<span class="sourceLineNo">042</span> INTEGRITY("auth-int"),<a name="line.42"></a>
+<span class="sourceLineNo">043</span> PRIVACY("auth-conf");<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> private final String saslQop;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span> QualityOfProtection(String saslQop) {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> this.saslQop = saslQop;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> }<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span> public String getSaslQop() {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> return saslQop;<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> public boolean matches(String stringQop) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> if (saslQop.equals(stringQop)) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span> LOG.warn("Use authentication/integrity/privacy as value for rpc protection "<a name="line.57"></a>
+<span class="sourceLineNo">058</span> + "configurations instead of auth/auth-int/auth-conf.");<a name="line.58"></a>
+<span class="sourceLineNo">059</span> return true;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> }<a name="line.60"></a>
+<span class="sourceLineNo">061</span> return name().equalsIgnoreCase(stringQop);<a name="line.61"></a>
+<span class="sourceLineNo">062</span> }<a name="line.62"></a>
+<span class="sourceLineNo">063</span> }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> /** Splitting fully qualified Kerberos name into parts */<a name="line.65"></a>
+<span class="sourceLineNo">066</span> public static String[] splitKerberosName(String fullName) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> return fullName.split("[/@]");<a name="line.67"></a>
+<span class="sourceLineNo">068</span> }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> static String encodeIdentifier(byte[] identifier) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> return new String(Base64.encodeBase64(identifier));<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> static byte[] decodeIdentifier(String identifier) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> return Base64.decodeBase64(identifier.getBytes());<a name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> static char[] encodePassword(byte[] password) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return new String(Base64.encodeBase64(password)).toCharArray();<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> /**<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * Returns {@link org.apache.hadoop.hbase.security.SaslUtil.QualityOfProtection}<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * corresponding to the given {@code stringQop} value.<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * @throws IllegalArgumentException If stringQop doesn't match any QOP.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> */<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public static QualityOfProtection getQop(String stringQop) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> for (QualityOfProtection qop : QualityOfProtection.values()) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> if (qop.matches(stringQop)) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> return qop;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span> throw new IllegalArgumentException("Invalid qop: " + stringQop<a name="line.93"></a>
+<span class="sourceLineNo">094</span> + ". It must be one of 'authentication', 'integrity', 'privacy'.");<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> /**<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @param rpcProtection Value of 'hbase.rpc.protection' configuration.<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * @return Map with values for SASL properties.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> */<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public static Map<String, String> initSaslProperties(String rpcProtection) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> String saslQop;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (rpcProtection.isEmpty()) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> saslQop = QualityOfProtection.AUTHENTICATION.getSaslQop();<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } else {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> String[] qops = rpcProtection.split(",");<a name="line.106"></a>
+<span class="sourceLineNo">107</span> StringBuilder saslQopBuilder = new StringBuilder();<a name="line.107"></a>
+<span class="sourceLineNo">108</span> for (int i = 0; i < qops.length; ++i) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> QualityOfProtection qop = getQop(qops[i]);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> saslQopBuilder.append(",").append(qop.getSaslQop());<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span> saslQop = saslQopBuilder.substring(1); // remove first ','<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span> Map<String, String> saslProps = new TreeMap<>();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> saslProps.put(Sasl.QOP, saslQop);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> saslProps.put(Sasl.SERVER_AUTH, "true");<a name="line.116"></a>
+<span class="sourceLineNo">117</span> return saslProps;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> static void safeDispose(SaslClient saslClient) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> try {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> saslClient.dispose();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> } catch (SaslException e) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> LOG.error("Error disposing of SASL client", 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> static void safeDispose(SaslServer saslServer) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> try {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> saslServer.dispose();<a name="line.130"></a>
+<span class="sourceLineNo">131</span> } catch (SaslException e) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> LOG.error("Error disposing of SASL server", e);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f8f0a032/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.html
index 9ee1f3f..282ab86 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/SaslUtil.html
@@ -32,106 +32,115 @@
<span class="sourceLineNo">024</span>import javax.security.sasl.Sasl;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import javax.security.sasl.SaslClient;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import javax.security.sasl.SaslException;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.commons.codec.binary.Base64;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.commons.logging.Log;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.commons.logging.LogFactory;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>@InterfaceAudience.Private<a name="line.33"></a>
-<span class="sourceLineNo">034</span>public class SaslUtil {<a name="line.34"></a>
-<span class="sourceLineNo">035</span> private static final Log LOG = LogFactory.getLog(SaslUtil.class);<a name="line.35"></a>
-<span class="sourceLineNo">036</span> public static final String SASL_DEFAULT_REALM = "default";<a name="line.36"></a>
-<span class="sourceLineNo">037</span> public static final int SWITCH_TO_SIMPLE_AUTH = -88;<a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span> public enum QualityOfProtection {<a name="line.39"></a>
-<span class="sourceLineNo">040</span> AUTHENTICATION("auth"),<a name="line.40"></a>
-<span class="sourceLineNo">041</span> INTEGRITY("auth-int"),<a name="line.41"></a>
-<span class="sourceLineNo">042</span> PRIVACY("auth-conf");<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span> private final String saslQop;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span> QualityOfProtection(String saslQop) {<a name="line.46"></a>
-<span class="sourceLineNo">047</span> this.saslQop = saslQop;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> }<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> public String getSaslQop() {<a name="line.50"></a>
-<span class="sourceLineNo">051</span> return saslQop;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> }<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span> public boolean matches(String stringQop) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span> if (saslQop.equals(stringQop)) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> LOG.warn("Use authentication/integrity/privacy as value for rpc protection "<a name="line.56"></a>
-<span class="sourceLineNo">057</span> + "configurations instead of auth/auth-int/auth-conf.");<a name="line.57"></a>
-<span class="sourceLineNo">058</span> return true;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span> return name().equalsIgnoreCase(stringQop);<a name="line.60"></a>
-<span class="sourceLineNo">061</span> }<a name="line.61"></a>
-<span class="sourceLineNo">062</span> }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> /** Splitting fully qualified Kerberos name into parts */<a name="line.64"></a>
-<span class="sourceLineNo">065</span> public static String[] splitKerberosName(String fullName) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> return fullName.split("[/@]");<a name="line.66"></a>
-<span class="sourceLineNo">067</span> }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> static String encodeIdentifier(byte[] identifier) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> return new String(Base64.encodeBase64(identifier));<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> static byte[] decodeIdentifier(String identifier) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> return Base64.decodeBase64(identifier.getBytes());<a name="line.74"></a>
-<span class="sourceLineNo">075</span> }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> static char[] encodePassword(byte[] password) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> return new String(Base64.encodeBase64(password)).toCharArray();<a name="line.78"></a>
-<span class="sourceLineNo">079</span> }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> /**<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * Returns {@link org.apache.hadoop.hbase.security.SaslUtil.QualityOfProtection}<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * corresponding to the given {@code stringQop} value.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * @throws IllegalArgumentException If stringQop doesn't match any QOP.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> public static QualityOfProtection getQop(String stringQop) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> for (QualityOfProtection qop : QualityOfProtection.values()) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> if (qop.matches(stringQop)) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return qop;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span> throw new IllegalArgumentException("Invalid qop: " + stringQop<a name="line.92"></a>
-<span class="sourceLineNo">093</span> + ". It must be one of 'authentication', 'integrity', 'privacy'.");<a name="line.93"></a>
-<span class="sourceLineNo">094</span> }<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> * @param rpcProtection Value of 'hbase.rpc.protection' configuration.<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * @return Map with values for SASL properties.<a name="line.98"></a>
-<span class="sourceLineNo">099</span> */<a name="line.99"></a>
-<span class="sourceLineNo">100</span> static Map<String, String> initSaslProperties(String rpcProtection) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> String saslQop;<a name="line.101"></a>
-<span class="sourceLineNo">102</span> if (rpcProtection.isEmpty()) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> saslQop = QualityOfProtection.AUTHENTICATION.getSaslQop();<a name="line.103"></a>
-<span class="sourceLineNo">104</span> } else {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> String[] qops = rpcProtection.split(",");<a name="line.105"></a>
-<span class="sourceLineNo">106</span> StringBuilder saslQopBuilder = new StringBuilder();<a name="line.106"></a>
-<span class="sourceLineNo">107</span> for (int i = 0; i < qops.length; ++i) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> QualityOfProtection qop = getQop(qops[i]);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> saslQopBuilder.append(",").append(qop.getSaslQop());<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span> saslQop = saslQopBuilder.substring(1); // remove first ','<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> Map<String, String> saslProps = new TreeMap<>();<a name="line.113"></a>
-<span class="sourceLineNo">114</span> saslProps.put(Sasl.QOP, saslQop);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> saslProps.put(Sasl.SERVER_AUTH, "true");<a name="line.115"></a>
-<span class="sourceLineNo">116</span> return saslProps;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> static void safeDispose(SaslClient saslClient) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> try {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> saslClient.dispose();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> } catch (SaslException e) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> LOG.error("Error disposing of SASL client", e);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<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">027</span>import javax.security.sasl.SaslServer;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.commons.codec.binary.Base64;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.commons.logging.Log;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.commons.logging.LogFactory;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>@InterfaceAudience.Private<a name="line.34"></a>
+<span class="sourceLineNo">035</span>public class SaslUtil {<a name="line.35"></a>
+<span class="sourceLineNo">036</span> private static final Log LOG = LogFactory.getLog(SaslUtil.class);<a name="line.36"></a>
+<span class="sourceLineNo">037</span> public static final String SASL_DEFAULT_REALM = "default";<a name="line.37"></a>
+<span class="sourceLineNo">038</span> public static final int SWITCH_TO_SIMPLE_AUTH = -88;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> public enum QualityOfProtection {<a name="line.40"></a>
+<span class="sourceLineNo">041</span> AUTHENTICATION("auth"),<a name="line.41"></a>
+<span class="sourceLineNo">042</span> INTEGRITY("auth-int"),<a name="line.42"></a>
+<span class="sourceLineNo">043</span> PRIVACY("auth-conf");<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> private final String saslQop;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span> QualityOfProtection(String saslQop) {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> this.saslQop = saslQop;<a name="line.48"></a>
+<span class="sourceLineNo">049</span> }<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span> public String getSaslQop() {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> return saslQop;<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> public boolean matches(String stringQop) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> if (saslQop.equals(stringQop)) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span> LOG.warn("Use authentication/integrity/privacy as value for rpc protection "<a name="line.57"></a>
+<span class="sourceLineNo">058</span> + "configurations instead of auth/auth-int/auth-conf.");<a name="line.58"></a>
+<span class="sourceLineNo">059</span> return true;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> }<a name="line.60"></a>
+<span class="sourceLineNo">061</span> return name().equalsIgnoreCase(stringQop);<a name="line.61"></a>
+<span class="sourceLineNo">062</span> }<a name="line.62"></a>
+<span class="sourceLineNo">063</span> }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> /** Splitting fully qualified Kerberos name into parts */<a name="line.65"></a>
+<span class="sourceLineNo">066</span> public static String[] splitKerberosName(String fullName) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> return fullName.split("[/@]");<a name="line.67"></a>
+<span class="sourceLineNo">068</span> }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> static String encodeIdentifier(byte[] identifier) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> return new String(Base64.encodeBase64(identifier));<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> static byte[] decodeIdentifier(String identifier) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> return Base64.decodeBase64(identifier.getBytes());<a name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> static char[] encodePassword(byte[] password) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return new String(Base64.encodeBase64(password)).toCharArray();<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> /**<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * Returns {@link org.apache.hadoop.hbase.security.SaslUtil.QualityOfProtection}<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * corresponding to the given {@code stringQop} value.<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * @throws IllegalArgumentException If stringQop doesn't match any QOP.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> */<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public static QualityOfProtection getQop(String stringQop) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> for (QualityOfProtection qop : QualityOfProtection.values()) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> if (qop.matches(stringQop)) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> return qop;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span> throw new IllegalArgumentException("Invalid qop: " + stringQop<a name="line.93"></a>
+<span class="sourceLineNo">094</span> + ". It must be one of 'authentication', 'integrity', 'privacy'.");<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> /**<a name="line.97"></a>
+<span class="sourceLineNo">098</span> * @param rpcProtection Value of 'hbase.rpc.protection' configuration.<a name="line.98"></a>
+<span class="sourceLineNo">099</span> * @return Map with values for SASL properties.<a name="line.99"></a>
+<span class="sourceLineNo">100</span> */<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public static Map<String, String> initSaslProperties(String rpcProtection) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> String saslQop;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> if (rpcProtection.isEmpty()) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> saslQop = QualityOfProtection.AUTHENTICATION.getSaslQop();<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } else {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> String[] qops = rpcProtection.split(",");<a name="line.106"></a>
+<span class="sourceLineNo">107</span> StringBuilder saslQopBuilder = new StringBuilder();<a name="line.107"></a>
+<span class="sourceLineNo">108</span> for (int i = 0; i < qops.length; ++i) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span> QualityOfProtection qop = getQop(qops[i]);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> saslQopBuilder.append(",").append(qop.getSaslQop());<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span> saslQop = saslQopBuilder.substring(1); // remove first ','<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span> Map<String, String> saslProps = new TreeMap<>();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> saslProps.put(Sasl.QOP, saslQop);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> saslProps.put(Sasl.SERVER_AUTH, "true");<a name="line.116"></a>
+<span class="sourceLineNo">117</span> return saslProps;<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> static void safeDispose(SaslClient saslClient) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> try {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> saslClient.dispose();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> } catch (SaslException e) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> LOG.error("Error disposing of SASL client", 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> static void safeDispose(SaslServer saslServer) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> try {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> saslServer.dispose();<a name="line.130"></a>
+<span class="sourceLineNo">131</span> } catch (SaslException e) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> LOG.error("Error disposing of SASL server", e);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<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>