Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-3581. FSPermissionChecker#checkPermission sticky bit check missing range check. Contributed by Eli Collins 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1356971 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-07-03 21:43:25 +00:00
parent 8188c1cb41
commit 359b4efd19
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -399,6 +399,9 @@ Branch-2 ( Unreleased changes )
HDFS-3574. Fix small race and do some cleanup in GetImageServlet (todd) HDFS-3574. Fix small race and do some cleanup in GetImageServlet (todd)
HDFS-3581. FSPermissionChecker#checkPermission sticky bit check
missing range check. (eli)
BREAKDOWN OF HDFS-3042 SUBTASKS BREAKDOWN OF HDFS-3042 SUBTASKS
HDFS-2185. HDFS portion of ZK-based FailoverController (todd) HDFS-2185. HDFS portion of ZK-based FailoverController (todd)

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSPermissionChecker.java
View File

@ -127,10 +127,10 @@ class FSPermissionChecker {
ancestorIndex--); ancestorIndex--);
checkTraverse(inodes, ancestorIndex); checkTraverse(inodes, ancestorIndex);
if(parentAccess != null && parentAccess.implies(FsAction.WRITE) if (parentAccess != null && parentAccess.implies(FsAction.WRITE)
&& inodes[inodes.length - 1] != null) && inodes.length > 1 && inodes[inodes.length - 1] != null) {
checkStickyBit(inodes[inodes.length - 2], inodes[inodes.length - 1]); checkStickyBit(inodes[inodes.length - 2], inodes[inodes.length - 1]);
}
if (ancestorAccess != null && inodes.length > 1) { if (ancestorAccess != null && inodes.length > 1) {
check(inodes, ancestorIndex, ancestorAccess); check(inodes, ancestorIndex, ancestorAccess);
} }

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsFileSystemContract.java
View File

@ -259,8 +259,8 @@ public class TestWebHdfsFileSystemContract extends FileSystemContractBaseTest {
assertTrue(status != null); assertTrue(status != null);
assertEquals(0777, status.getPermission().toShort()); assertEquals(0777, status.getPermission().toShort());
//delete root - disabled due to a sticky bit bug //delete root
//assertFalse(fs.delete(root, true)); assertFalse(fs.delete(root, true));
//create file using root path //create file using root path
try { try {