Return-Path: Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: (qmail 60164 invoked from network); 4 Mar 2011 03:46:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Mar 2011 03:46:30 -0000 Received: (qmail 98489 invoked by uid 500); 4 Mar 2011 03:46:29 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 98461 invoked by uid 500); 4 Mar 2011 03:46:29 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 98454 invoked by uid 99); 4 Mar 2011 03:46:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 03:46:29 +0000 X-ASF-Spam-Status: No, hits=-1998.0 required=5.0 tests=ALL_TRUSTED,FB_GET_MEDS X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Mar 2011 03:46:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 763D22388C28; Fri, 4 Mar 2011 03:46:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1077148 - in /hadoop/common/branches/branch-0.20-security-patches/src: contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ hdfs/org/apache/hadoop/hdfs/ hdfs/org/apache/hadoop/hdfs/security/ hdfs/org/apache/hadoop/hdfs/server/namenode/ ... Date: Fri, 04 Mar 2011 03:46:02 -0000 To: common-commits@hadoop.apache.org From: omalley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110304034602.763D22388C28@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: omalley Date: Fri Mar 4 03:46:01 2011 New Revision: 1077148 URL: http://svn.apache.org/viewvc?rev=1077148&view=rev Log: commit f2f3604d06d2346eebaf1d7c854b99b95b8dc05a Author: Boris Shkolnik Date: Fri Feb 5 23:06:29 2010 +0000 HDFS:938 from https://issues.apache.org/jira/secure/attachment/12435015/HDFS-938-BP20-2.patch +++ b/YAHOO-CHANGES.txt + HDFS-938. Replace calls to UGI.getUserName() with + UGI.getShortUserName()(boryas) + Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFileDataServlet.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/security/AccessTokenHandler.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PermissionChecker.java hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/AppendTestUtil.java hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSShell.java hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestFileAppend2.java hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestLocalDFS.java hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestQuota.java Modified: hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFileDataServlet.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFileDataServlet.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFileDataServlet.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFileDataServlet.java Fri Mar 4 03:46:01 2011 @@ -40,7 +40,7 @@ public class ProxyFileDataServlet extend URISyntaxException { return new URI(request.getScheme(), null, request.getServerName(), request .getServerPort(), "/streamFile", "filename=" + i.getPath() + "&ugi=" - + ugi.getUserName(), null); + + ugi.getShortUserName(), null); } /** {@inheritDoc} */ Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/DistributedFileSystem.java Fri Mar 4 03:46:01 2011 @@ -153,7 +153,7 @@ public class DistributedFileSystem exten /** {@inheritDoc} */ public Path getHomeDirectory() { - return new Path("/user/" + dfs.ugi.getUserName()).makeQualified(this); + return new Path("/user/" + dfs.ugi.getShortUserName()).makeQualified(this); } private String getPathName(Path file) { Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/HftpFileSystem.java Fri Mar 4 03:46:01 2011 @@ -131,7 +131,7 @@ public class HftpFileSystem extends File @Override public FSDataInputStream open(Path f, int buffersize) throws IOException { HttpURLConnection connection = null; - connection = openConnection("/data" + f.toUri().getPath(), "ugi=" + ugi.getUserName()); + connection = openConnection("/data" + f.toUri().getPath(), "ugi=" + ugi.getShortUserName()); connection.setRequestMethod("GET"); connection.connect(); final InputStream in = connection.getInputStream(); @@ -271,7 +271,7 @@ public class HftpFileSystem extends File private FileChecksum getFileChecksum(String f) throws IOException { final HttpURLConnection connection = openConnection( - "/fileChecksum" + f, "ugi=" + ugi.getUserName()); + "/fileChecksum" + f, "ugi=" + ugi.getShortUserName()); try { final XMLReader xr = XMLReaderFactory.createXMLReader(); xr.setContentHandler(this); Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/security/AccessTokenHandler.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/security/AccessTokenHandler.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/security/AccessTokenHandler.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/security/AccessTokenHandler.java Fri Mar 4 03:46:01 2011 @@ -226,7 +226,7 @@ public class AccessTokenHandler { public BlockAccessToken generateToken(long blockID, EnumSet modes) throws IOException { UserGroupInformation ugi = UserGroupInformation.getCurrentUser(); - String userID = (ugi == null ? null : ugi.getUserName()); + String userID = (ugi == null ? null : ugi.getShortUserName()); return generateToken(userID, blockID, modes); } Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java Fri Mar 4 03:46:01 2011 @@ -70,7 +70,7 @@ abstract class DfsServlet extends HttpSe } if(LOG.isDebugEnabled()) - LOG.debug("getUGI is returning: " + u.getUserName()); + LOG.debug("getUGI is returning: " + u.getShortUserName()); return u; } @@ -96,7 +96,7 @@ abstract class DfsServlet extends HttpSe : host.getInfoPort(); final String filename = request.getPathInfo(); return new URI(scheme, null, hostname, port, servletpath, - "filename=" + filename + "&ugi=" + ugi.getUserName(), null); + "filename=" + filename + "&ugi=" + ugi.getShortUserName(), null); } /** Get filename from the request */ Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Fri Mar 4 03:46:01 2011 @@ -415,7 +415,7 @@ public class FSNamesystem implements FSC LOG.info("isPermissionEnabled=" + isPermissionEnabled); short filePermission = (short)conf.getInt("dfs.upgrade.permission", 0777); this.defaultPermission = PermissionStatus.createImmutable( - fsOwner.getUserName(), supergroup, new FsPermission(filePermission)); + fsOwner.getShortUserName(), supergroup, new FsPermission(filePermission)); this.replicator = new ReplicationTargetChooser( @@ -4589,7 +4589,7 @@ public class FSNamesystem implements FSC } PermissionStatus createFsOwnerPermissions(FsPermission permission) { - return new PermissionStatus(fsOwner.getUserName(), supergroup, permission); + return new PermissionStatus(fsOwner.getShortUserName(), supergroup, permission); } private FSPermissionChecker checkOwner(String path) throws AccessControlException { @@ -4631,7 +4631,7 @@ public class FSNamesystem implements FSC FsAction ancestorAccess, FsAction parentAccess, FsAction access, FsAction subAccess) throws AccessControlException { FSPermissionChecker pc = new FSPermissionChecker( - fsOwner.getUserName(), supergroup); + fsOwner.getShortUserName(), supergroup); if (!pc.isSuper) { dir.waitForReady(); pc.checkPermission(path, dir.rootDir, doCheckOwner, @@ -4902,7 +4902,7 @@ public class FSNamesystem implements FSC public Token getDelegationToken(Text renewer) throws IOException { - String user = UserGroupInformation.getCurrentUser().getUserName(); + String user = UserGroupInformation.getCurrentUser().getShortUserName(); Text owner = new Text(user); DelegationTokenIdentifier dtId = new DelegationTokenIdentifier(owner, renewer); return new Token(dtId, dtSecretManager); @@ -4910,13 +4910,13 @@ public class FSNamesystem implements FSC public Boolean renewDelegationToken(Token token) throws InvalidToken, IOException { - String renewer = UserGroupInformation.getCurrentUser().getUserName(); + String renewer = UserGroupInformation.getCurrentUser().getShortUserName(); return dtSecretManager.renewToken(token, renewer); } public Boolean cancelDelegationToken(Token token) throws IOException { - String canceller = UserGroupInformation.getCurrentUser().getUserName(); + String canceller = UserGroupInformation.getCurrentUser().getShortUserName(); return dtSecretManager.cancelToken(token, canceller); } } Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java Fri Mar 4 03:46:01 2011 @@ -48,7 +48,7 @@ private final UserGroupInformation ugi; } groups.addAll(Arrays.asList(ugi.getGroupNames())); - user = ugi.getUserName(); + user = ugi.getShortUserName(); isSuper = user.equals(fsOwner) || groups.contains(supergroup); } @@ -69,7 +69,7 @@ private final UserGroupInformation ugi; String supergroup) throws AccessControlException { FSPermissionChecker checker = - new FSPermissionChecker(owner.getUserName(), supergroup); + new FSPermissionChecker(owner.getShortUserName(), supergroup); if (!checker.isSuper) { throw new AccessControlException("Access denied for user " + checker.user + ". Superuser privilege is required"); Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FileDataServlet.java Fri Mar 4 03:46:01 2011 @@ -53,7 +53,7 @@ public class FileDataServlet extends Dfs ? (Integer)getServletContext().getAttribute("datanode.https.port") : host.getInfoPort(), "/streamFile", "filename=" + i.getPath() + - "&ugi=" + ugi.getUserName(), null); + "&ugi=" + ugi.getShortUserName(), null); } private static JspHelper jspHelper = null; Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java Fri Mar 4 03:46:01 2011 @@ -403,7 +403,7 @@ public class NameNode implements ClientP + MAX_PATH_LENGTH + " characters, " + MAX_PATH_DEPTH + " levels."); } namesystem.startFile(src, - new PermissionStatus(UserGroupInformation.getCurrentUser().getUserName(), + new PermissionStatus(UserGroupInformation.getCurrentUser().getShortUserName(), null, masked), clientName, clientMachine, overwrite, replication, blockSize); myMetrics.numFilesCreated.inc(); @@ -568,7 +568,7 @@ public class NameNode implements ClientP + MAX_PATH_LENGTH + " characters, " + MAX_PATH_DEPTH + " levels."); } return namesystem.mkdirs(src, - new PermissionStatus(UserGroupInformation.getCurrentUser().getUserName(), + new PermissionStatus(UserGroupInformation.getCurrentUser().getShortUserName(), null, masked)); } @@ -929,7 +929,7 @@ public class NameNode implements ClientP @Override public void refreshUserToGroupsMappings(Configuration conf) throws IOException { LOG.info("Refreshing all user-to-groups mappings. Requested by user: " + - UserGroupInformation.getCurrentUser().getUserName()); + UserGroupInformation.getCurrentUser().getShortUserName()); Groups.getUserToGroupsMappingService(conf).refresh(); } Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PermissionChecker.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PermissionChecker.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PermissionChecker.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/server/namenode/PermissionChecker.java Fri Mar 4 03:46:01 2011 @@ -47,7 +47,7 @@ class PermissionChecker { LOG.debug("ugi=" + ugi); } - user = ugi.getUserName(); + user = ugi.getShortUserName(); groups.addAll(Arrays.asList(ugi.getGroupNames())); isSuper = user.equals(fsOwner) || groups.contains(supergroup); } @@ -64,7 +64,7 @@ class PermissionChecker { String supergroup) throws AccessControlException { PermissionChecker checker = - new PermissionChecker(owner.getUserName(), supergroup); + new PermissionChecker(owner.getShortUserName(), supergroup); if (!checker.isSuper) { throw new AccessControlException("Access denied for user " + checker.user + ". Superuser privilege is required"); Modified: hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/hdfs/org/apache/hadoop/hdfs/tools/DFSck.java Fri Mar 4 03:46:01 2011 @@ -108,7 +108,7 @@ public class DFSck extends Configured im } final StringBuffer url = new StringBuffer("http://"); - url.append(getInfoServer()).append("/fsck?ugi=").append(ugi.getUserName()).append("&path="); + url.append(getInfoServer()).append("/fsck?ugi=").append(ugi.getShortUserName()).append("&path="); String dir = "/"; // find top-level dir first Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/AppendTestUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/AppendTestUtil.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/AppendTestUtil.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/AppendTestUtil.java Fri Mar 4 03:46:01 2011 @@ -83,7 +83,7 @@ class AppendTestUtil { public static FileSystem createHdfsWithDifferentUsername(final Configuration conf ) throws IOException, InterruptedException { - String username = UserGroupInformation.getCurrentUser().getUserName()+"_XXX"; + String username = UserGroupInformation.getCurrentUser().getShortUserName()+"_XXX"; UserGroupInformation ugi = UserGroupInformation.createUserForTesting(username, new String[]{"supergroup"}); Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSPermission.java Fri Mar 4 03:46:01 2011 @@ -261,15 +261,15 @@ public class TestDFSPermission extends T fs = FileSystem.get(conf); create(op, FILE_DIR_PATH, DEFAULT_UMASK, new FsPermission(DEFAULT_PERMISSION)); - checkOwnership(FILE_DIR_PATH, SUPERUSER.getUserName(), + checkOwnership(FILE_DIR_PATH, SUPERUSER.getShortUserName(), getGroup(FILE_DIR_PATH.getParent())); // case 2: superuser changes FILE_DIR_PATH's owner to be - setOwner(FILE_DIR_PATH, USER1.getUserName(), GROUP3_NAME, false); + setOwner(FILE_DIR_PATH, USER1.getShortUserName(), GROUP3_NAME, false); // case 3: user1 changes FILE_DIR_PATH's owner to be user2 login(USER1); - setOwner(FILE_DIR_PATH, USER2.getUserName(), null, true); + setOwner(FILE_DIR_PATH, USER2.getShortUserName(), null, true); // case 4: user1 changes FILE_DIR_PATH's group to be group1 which it belongs // to @@ -284,7 +284,7 @@ public class TestDFSPermission extends T setOwner(FILE_DIR_PATH, null, GROUP3_NAME, true); // case 7: user2 (non-owner) changes FILE_DIR_PATH's user to be user2 - setOwner(FILE_DIR_PATH, USER2.getUserName(), null, true); + setOwner(FILE_DIR_PATH, USER2.getShortUserName(), null, true); // delete the file/directory login(SUPERUSER); Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSShell.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSShell.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSShell.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestDFSShell.java Fri Mar 4 03:46:01 2011 @@ -1256,7 +1256,7 @@ public class TestDFSShell extends TestCa dfs.setPermission(sub, new FsPermission((short)0)); final UserGroupInformation ugi = UserGroupInformation.getCurrentUser(); - final String tmpusername = ugi.getUserName() + "1"; + final String tmpusername = ugi.getShortUserName() + "1"; UserGroupInformation tmpUGI = UserGroupInformation.createUserForTesting( tmpusername, new String[] {tmpusername}); String results = tmpUGI.doAs(new PrivilegedExceptionAction() { Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestFileAppend2.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestFileAppend2.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestFileAppend2.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestFileAppend2.java Fri Mar 4 03:46:01 2011 @@ -196,7 +196,7 @@ public class TestFileAppend2 extends Tes final UserGroupInformation superuser = UserGroupInformation.getCurrentUser(); String username = "testappenduser"; String group = "testappendgroup"; - assertFalse(superuser.getUserName().equals(username)); + assertFalse(superuser.getShortUserName().equals(username)); assertFalse(Arrays.asList(superuser.getGroupNames()).contains(group)); UserGroupInformation appenduser = UserGroupInformation.createUserForTesting(username, new String[]{group}); Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java Fri Mar 4 03:46:01 2011 @@ -33,7 +33,7 @@ public class TestHDFSFileSystemContract cluster = new MiniDFSCluster(conf, 2, true, null); fs = cluster.getFileSystem(); defaultWorkingDirectory = "/user/" + - UserGroupInformation.getCurrentUser().getUserName(); + UserGroupInformation.getCurrentUser().getShortUserName(); } @Override Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestLocalDFS.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestLocalDFS.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestLocalDFS.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestLocalDFS.java Fri Mar 4 03:46:01 2011 @@ -51,7 +51,7 @@ public class TestLocalDFS extends TestCa static String getUserName(FileSystem fs) { if (fs instanceof DistributedFileSystem) { - return ((DistributedFileSystem)fs).dfs.ugi.getUserName(); + return ((DistributedFileSystem)fs).dfs.ugi.getShortUserName(); } return System.getProperty("user.name"); } Modified: hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestQuota.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestQuota.java?rev=1077148&r1=1077147&r2=1077148&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestQuota.java (original) +++ hadoop/common/branches/branch-0.20-security-patches/src/test/org/apache/hadoop/hdfs/TestQuota.java Fri Mar 4 03:46:01 2011 @@ -252,7 +252,7 @@ public class TestQuota extends TestCase @Override public Object run() throws Exception { assertEquals("Not running as new user", username, - UserGroupInformation.getCurrentUser().getUserName()); + UserGroupInformation.getCurrentUser().getShortUserName()); DFSAdmin userAdmin = new DFSAdmin(conf); args2[1] = "100";