svn commit: r944397 - in /hadoop/common/trunk: ./ src/java/org/apache/hadoop/fs/ src/java/org/apache/hadoop/ipc/ src/java/org/apache/hadoop/security/ src/java/org/apache/hadoop/security/authorize/

[boryas]

Author: boryas
Date: Fri May 14 19:00:18 2010
New Revision: 944397

URL: http://svn.apache.org/viewvc?rev=944397&view=rev
Log:
HADOOP-6612.  Protocols RefreshUserToGroupMappingsProtocol and  
RefreshAuthorizationPolicyProtocol will fail with security enabled (boryas)

Modified:
    hadoop/common/trunk/CHANGES.txt
    
hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
    hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Client.java
    
hadoop/common/trunk/src/java/org/apache/hadoop/security/RefreshUserToGroupMappingsProtocol.java
    
hadoop/common/trunk/src/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java

Modified: hadoop/common/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=944397&r1=944396&r2=944397&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Fri May 14 19:00:18 2010
@@ -12,6 +12,9 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    HADOOP-6612.  Protocols RefreshUserToGroupMappingsProtocol and 
+    RefreshAuthorizationPolicyProtocol will fail with security enabled (boryas)
+
     HADOOP-6764. Remove verbose logging from the Groups class. (Boris Shkolnik)
 
     HADOOP-6730. Bug in FileContext#copy and provide base class for 
FileContext 

Modified: 
hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java?rev=944397&r1=944396&r2=944397&view=diff
==============================================================================
--- 
hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java 
(original)
+++ 
hadoop/common/trunk/src/java/org/apache/hadoop/fs/CommonConfigurationKeys.java 
Fri May 14 19:00:18 2010
@@ -152,5 +152,7 @@ public class CommonConfigurationKeys {
    */
   public final static String HADOOP_CLUSTER_ADMINISTRATORS_PROPERTY =
       "hadoop.cluster.administrators";
+  public static final String  HADOOP_SECURITY_SERVICE_USER_NAME_KEY = 
+    "hadoop.security.service.user.name.key";
 }
 

Modified: hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Client.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Client.java?rev=944397&r1=944396&r2=944397&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Client.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/ipc/Client.java Fri May 14 
19:00:18 2010
@@ -255,6 +255,11 @@ public class Client {
         if (krbInfo != null) {
           String serverKey = krbInfo.serverPrincipal();
           if (serverKey != null) {
+            if(LOG.isDebugEnabled()) {
+              LOG.info("server principal key for protocol="
+                  + protocol.getCanonicalName() + " is " + serverKey + 
+                  " and val =" + conf.get(serverKey));
+            }
             serverPrincipal = conf.get(serverKey);
           }
         }

Modified: 
hadoop/common/trunk/src/java/org/apache/hadoop/security/RefreshUserToGroupMappingsProtocol.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/security/RefreshUserToGroupMappingsProtocol.java?rev=944397&r1=944396&r2=944397&view=diff
==============================================================================
--- 
hadoop/common/trunk/src/java/org/apache/hadoop/security/RefreshUserToGroupMappingsProtocol.java
 (original)
+++ 
hadoop/common/trunk/src/java/org/apache/hadoop/security/RefreshUserToGroupMappingsProtocol.java
 Fri May 14 19:00:18 2010
@@ -20,12 +20,16 @@ package org.apache.hadoop.security;
 import java.io.IOException;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.ipc.VersionedProtocol;
+import org.apache.hadoop.security.KerberosInfo;
 
 /**
  * Protocol use 
  *
  */
+...@kerberosinfo(
+    
serverPrincipal=CommonConfigurationKeys.HADOOP_SECURITY_SERVICE_USER_NAME_KEY)
 public interface RefreshUserToGroupMappingsProtocol extends VersionedProtocol {
   
   /**

Modified: 
hadoop/common/trunk/src/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java?rev=944397&r1=944396&r2=944397&view=diff
==============================================================================
--- 
hadoop/common/trunk/src/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java
 (original)
+++ 
hadoop/common/trunk/src/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java
 Fri May 14 19:00:18 2010
@@ -19,11 +19,15 @@ package org.apache.hadoop.security.autho
 
 import java.io.IOException;
 
+import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.ipc.VersionedProtocol;
+import org.apache.hadoop.security.KerberosInfo;
 
 /**
  * Protocol which is used to refresh the authorization policy in use currently.
  */
+...@kerberosinfo(
+    
serverPrincipal=CommonConfigurationKeys.HADOOP_SECURITY_SERVICE_USER_NAME_KEY)
 public interface RefreshAuthorizationPolicyProtocol extends VersionedProtocol {
   
   /**