Author: kihwal
Date: Thu Feb 28 22:05:53 2013
New Revision: 1451383
URL: http://svn.apache.org/r1451383
Log:
HADOOP-9336. Allow UGI of current connection to be queried. Contributed by
Daryn Sharp.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1451383&r1=1451382&r2=1451383&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Feb 28 22:05:53 2013
@@ -23,6 +23,9 @@ Release 0.23.7 - UNRELEASED
HADOOP-8075. Lower native-hadoop library log from info to debug.
(Hızır Sefa İrken via eli)
+ HADOOP-9336. Allow UGI of current connection to be queried. (Daryn Sharp
+ via kihwal)
+
OPTIMIZATIONS
HADOOP-9147. Add missing fields to FIleStatus.toString.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1451383&r1=1451382&r2=1451383&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Thu Feb 28 22:05:53 2013
@@ -168,6 +168,14 @@ public abstract class Server {
return (addr == null) ? null : addr.getHostAddress();
}
+ /** Returns the RPC remote user when invoked inside an RPC. Note this
+ * may be different than the current user if called within another doAs
+ * @return connection's UGI or null if not an RPC
+ */
+ public static UserGroupInformation getRemoteUser() {
+ Call call = CurCall.get();
+ return (call != null) ? call.connection.user : null;
+ }
/** Return true if the invocation was through an RPC.
*/
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java?rev=1451383&r1=1451382&r2=1451383&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/TestDoAsEffectiveUser.java
Thu Feb 28 22:05:53 2013
@@ -126,6 +126,7 @@ public class TestDoAsEffectiveUser {
public static final long versionID = 1L;
String aMethod() throws IOException;
+ String getServerRemoteUser() throws IOException;
}
public class TestImpl implements TestProtocol {
@@ -134,6 +135,12 @@ public class TestDoAsEffectiveUser {
return UserGroupInformation.getCurrentUser().toString();
}
+ @Override
+ public String getServerRemoteUser() throws IOException {
+ return Server.getRemoteUser().toString();
+ }
+
+ @Override
public long getProtocolVersion(String protocol, long clientVersion)
throws IOException {
return TestProtocol.versionID;
@@ -146,7 +153,23 @@ public class TestDoAsEffectiveUser {
}
}
- @Test
+ private void checkRemoteUgi(final Server server,
+ final UserGroupInformation ugi, final Configuration conf)
+ throws Exception {
+ ugi.doAs(new PrivilegedExceptionAction<Void>() {
+ @Override
+ public Void run() throws IOException {
+ proxy = RPC.getProxy(
+ TestProtocol.class, TestProtocol.versionID,
+ NetUtils.getConnectAddress(server), conf);
+ Assert.assertEquals(ugi.toString(), proxy.aMethod());
+ Assert.assertEquals(ugi.toString(), proxy.getServerRemoteUser());
+ return null;
+ }
+ });
+ }
+
+ @Test(timeout=4000)
public void testRealUserSetup() throws IOException {
final Configuration conf = new Configuration();
conf.setStrings(ProxyUsers
@@ -159,23 +182,13 @@ public class TestDoAsEffectiveUser {
try {
server.start();
- final InetSocketAddress addr = NetUtils.getConnectAddress(server);
-
UserGroupInformation realUserUgi = UserGroupInformation
.createRemoteUser(REAL_USER_NAME);
+ checkRemoteUgi(server, realUserUgi, conf);
+
UserGroupInformation proxyUserUgi =
UserGroupInformation.createProxyUserForTesting(
PROXY_USER_NAME, realUserUgi, GROUP_NAMES);
- String retVal = proxyUserUgi
- .doAs(new PrivilegedExceptionAction<String>() {
- public String run() throws IOException {
- proxy = RPC.getProxy(TestProtocol.class,
- TestProtocol.versionID, addr, conf);
- String ret = proxy.aMethod();
- return ret;
- }
- });
-
- Assert.assertEquals(PROXY_USER_NAME + " (auth:PROXY) via " +
REAL_USER_NAME + " (auth:SIMPLE)", retVal);
+ checkRemoteUgi(server, proxyUserUgi, conf);
} catch (Exception e) {
e.printStackTrace();
Assert.fail();
@@ -187,7 +200,7 @@ public class TestDoAsEffectiveUser {
}
}
- @Test
+ @Test(timeout=4000)
public void testRealUserAuthorizationSuccess() throws IOException {
final Configuration conf = new Configuration();
configureSuperUserIPAddresses(conf, REAL_USER_SHORT_NAME);
@@ -204,20 +217,11 @@ public class TestDoAsEffectiveUser {
UserGroupInformation realUserUgi = UserGroupInformation
.createRemoteUser(REAL_USER_NAME);
+ checkRemoteUgi(server, realUserUgi, conf);
UserGroupInformation proxyUserUgi = UserGroupInformation
.createProxyUserForTesting(PROXY_USER_NAME, realUserUgi,
GROUP_NAMES);
- String retVal = proxyUserUgi
- .doAs(new PrivilegedExceptionAction<String>() {
- public String run() throws IOException {
- proxy = RPC.getProxy(TestProtocol.class,
- TestProtocol.versionID, addr, conf);
- String ret = proxy.aMethod();
- return ret;
- }
- });
-
- Assert.assertEquals(PROXY_USER_NAME + " (auth:PROXY) via " +
REAL_USER_NAME + " (auth:SIMPLE)", retVal);
+ checkRemoteUgi(server, proxyUserUgi, conf);
} catch (Exception e) {
e.printStackTrace();
Assert.fail();
